From a45c5fe986871fc8ad424df057f6898bd0d65118 Mon Sep 17 00:00:00 2001 From: JK Date: Tue, 14 Feb 2023 19:16:09 +0600 Subject: [PATCH 01/32] Fixed: Map js loading everywhere --- block.json | 1 - includes/block-assets.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/block.json b/block.json index 63266f8..ce04894 100644 --- a/block.json +++ b/block.json @@ -91,6 +91,5 @@ }, "editorScript":"maps-block-apple-block", "viewScript":"maps-block-apple-frontend", - "script": "apple-mapkit-js", "editorStyle": "file:build/index.css" } diff --git a/includes/block-assets.php b/includes/block-assets.php index f9ae22b..2f6269e 100644 --- a/includes/block-assets.php +++ b/includes/block-assets.php @@ -49,7 +49,7 @@ function register_block_assets() { wp_register_script( 'maps-block-apple-block', MAPS_BLOCK_APPLE_URL . "build/$block_file_name.js", - $block_dependencies['dependencies'], + array_merge( $block_dependencies['dependencies'], [ 'apple-mapkit-js' ] ), $block_dependencies['version'], false ); From 828b6a63eb4c4e3817b74977e30159957cb1cb70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 08:35:53 +0000 Subject: [PATCH 02/32] Bump word-wrap from 1.2.3 to 1.2.4 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e32fdd0..72dff8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21428,9 +21428,9 @@ "dev": true }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -37601,9 +37601,9 @@ "dev": true }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true }, "workerpool": { From 82ae193189ffdacee5965ff236186706bd9352d6 Mon Sep 17 00:00:00 2001 From: Rahul Prajapati Date: Thu, 20 Jul 2023 17:36:10 +0530 Subject: [PATCH 03/32] Add PHP version check for plugin. --- maps-block-apple.php | 51 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/maps-block-apple.php b/maps-block-apple.php index 2d1246e..cef2328 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -3,7 +3,7 @@ * Plugin Name: Block for Apple Maps * Plugin URI: https://github.com/10up/maps-block-apple * Description: An Apple Maps block for the WordPress block editor (Gutenberg). - * Version: 1.1.1 + * Version: 1.1.2 * Requires at least: 5.8 * Requires PHP: 7.4 * Author: 10up @@ -18,12 +18,59 @@ namespace tenup\Maps_Block_Apple; // Useful global constants. -define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.1' ); +define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.2' ); define( 'MAPS_BLOCK_APPLE_URL', plugin_dir_url( __FILE__ ) ); define( 'MAPS_BLOCK_APPLE_PATH', dirname( __FILE__ ) . '/' ); define( 'MAPS_BLOCK_APPLE_INC', MAPS_BLOCK_APPLE_PATH . 'includes/' ); define( 'MAPS_BLOCK_APPLE_BASENAME', plugin_basename( __FILE__ ) ); +/** + * Get the minimum version of PHP required by this plugin. + * + * @since 1.1.2 + * + * @return string Minimum version required. + */ +function minimum_php_requirement() { + return '7.4'; +} + +/** + * Whether PHP installation meets the minimum requirements + * + * @since 1.1.2 + * + * @return bool True if meets minimum requirements, false otherwise. + */ +function site_meets_php_requirements() { + return version_compare( phpversion(), minimum_php_requirement(), '>=' ); +} + +// Ensuring our PHP version requirement is met first before loading plugin. +if ( ! site_meets_php_requirements() ) { + add_action( + 'admin_notices', + function() { + ?> +
+

+ +

+
+ =5.8 * PHP 7.4 errors should be caught in the sandbox during activation. From 779b4250525bcba330dbd3e8d326bd10175ad78d Mon Sep 17 00:00:00 2001 From: Rahul Prajapati Date: Fri, 28 Jul 2023 18:00:01 +0530 Subject: [PATCH 04/32] Revert version update change. --- maps-block-apple.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/maps-block-apple.php b/maps-block-apple.php index cef2328..8ee767e 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -3,7 +3,7 @@ * Plugin Name: Block for Apple Maps * Plugin URI: https://github.com/10up/maps-block-apple * Description: An Apple Maps block for the WordPress block editor (Gutenberg). - * Version: 1.1.2 + * Version: 1.1.1 * Requires at least: 5.8 * Requires PHP: 7.4 * Author: 10up @@ -18,7 +18,7 @@ namespace tenup\Maps_Block_Apple; // Useful global constants. -define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.2' ); +define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.1' ); define( 'MAPS_BLOCK_APPLE_URL', plugin_dir_url( __FILE__ ) ); define( 'MAPS_BLOCK_APPLE_PATH', dirname( __FILE__ ) . '/' ); define( 'MAPS_BLOCK_APPLE_INC', MAPS_BLOCK_APPLE_PATH . 'includes/' ); @@ -27,8 +27,6 @@ /** * Get the minimum version of PHP required by this plugin. * - * @since 1.1.2 - * * @return string Minimum version required. */ function minimum_php_requirement() { @@ -38,8 +36,6 @@ function minimum_php_requirement() { /** * Whether PHP installation meets the minimum requirements * - * @since 1.1.2 - * * @return bool True if meets minimum requirements, false otherwise. */ function site_meets_php_requirements() { From 4cb1689db8a09fc7885c73a521432f450e852d55 Mon Sep 17 00:00:00 2001 From: Rahul Prajapati Date: Fri, 28 Jul 2023 18:10:43 +0530 Subject: [PATCH 05/32] Remove duplicate php version check. - Activation is checking 5.8 as min version, but as per plugin header php 7.4 is min requirement. --- maps-block-apple.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/maps-block-apple.php b/maps-block-apple.php index 8ee767e..69c0ee4 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -67,22 +67,6 @@ function() { return; } -/** - * Require WP version >=5.8 - * PHP 7.4 errors should be caught in the sandbox during activation. - */ -register_activation_hook( - __FILE__, - function() { - if ( ! version_compare( $GLOBALS['wp_version'], '5.8', '>=' ) ) { - wp_die( - esc_html__( 'Block for Apple Maps requires WordPress version 5.8 or greater.', 'maps-block-apple' ), - esc_html__( 'Error Activating', 'maps-block-apple' ) - ); - } - } -); - /** * Add options */ From 9dcc8ba583608028fb3bb79fc0b04646a3317c44 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 4 Aug 2023 07:01:30 -0500 Subject: [PATCH 06/32] Update and rename wordpress-latest.yml to wordpress-version-checker.yml --- .../{wordpress-latest.yml => wordpress-version-checker.yml} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename .github/workflows/{wordpress-latest.yml => wordpress-version-checker.yml} (80%) diff --git a/.github/workflows/wordpress-latest.yml b/.github/workflows/wordpress-version-checker.yml similarity index 80% rename from .github/workflows/wordpress-latest.yml rename to .github/workflows/wordpress-version-checker.yml index b134ea5..34e4410 100644 --- a/.github/workflows/wordpress-latest.yml +++ b/.github/workflows/wordpress-version-checker.yml @@ -10,11 +10,14 @@ on: schedule: - cron: '0 0 * * 1' +permissions: + issues: write + jobs: wordpress-version-checker: runs-on: ubuntu-latest steps: - name: WordPress version checker - uses: skaut/wordpress-version-checker@v1.2.0 + uses: skaut/wordpress-version-checker@master with: repo-token: ${{ secrets.GITHUB_TOKEN }} From 9ee10c5e92516a82a48c6c22724e4d0807c6f334 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 4 Aug 2023 07:01:46 -0500 Subject: [PATCH 07/32] Create .wordpress-version-checker.json --- .wordpress-version-checker.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .wordpress-version-checker.json diff --git a/.wordpress-version-checker.json b/.wordpress-version-checker.json new file mode 100644 index 0000000..9aa58aa --- /dev/null +++ b/.wordpress-version-checker.json @@ -0,0 +1,4 @@ +{ + "readme": "readme.txt", + "channel": "rc" +} From 34c692f098bf23931b7fceea00ede998a63c723a Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 4 Aug 2023 07:02:00 -0500 Subject: [PATCH 08/32] Update .distignore --- .distignore | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.distignore b/.distignore index 1f1c393..15ac7b3 100644 --- a/.distignore +++ b/.distignore @@ -8,14 +8,7 @@ /tests # Files -.distignore -.editorconfig -.eslintrc -.gitignore -.nvmrc -.phpcs.xml -.wp-env.json -.wp-env.override.json +.* CHANGELOG.md CODE_OF_CONDUCT.md composer.json From 08203841cd42180f69d2eaab0ca9bab48e324291 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:02:46 +0000 Subject: [PATCH 09/32] Bump tough-cookie and @cypress/request Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) and [@cypress/request](https://github.com/cypress-io/request). These dependencies needed to be updated together. Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3) Updates `@cypress/request` from 2.88.11 to 2.88.12 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](https://github.com/cypress-io/request/compare/v2.88.11...v2.88.12) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: "@cypress/request" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 101 ++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index e32fdd0..f857ecf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1874,9 +1874,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -1894,7 +1894,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" }, @@ -13990,30 +13990,6 @@ "node": ">= 6" } }, - "node_modules/jsdom/node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsdom/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -20153,16 +20129,27 @@ } }, "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { - "node": ">=0.8" + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" } }, "node_modules/tr46": { @@ -22942,9 +22929,9 @@ "requires": {} }, "@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -22962,7 +22949,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" } @@ -32008,24 +31995,6 @@ "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } - }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true } } }, @@ -36665,13 +36634,23 @@ "dev": true }, "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "dependencies": { + "universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true + } } }, "tr46": { From cedfb41ead0a4f845e8eff75d31427502df67ed9 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 1 Sep 2023 09:51:01 -0500 Subject: [PATCH 10/32] bump WordPress "tested up to" version 6.3 Co-Authored-By: QAharshalkadu <137804688+qaharshalkadu@users.noreply.github.com> --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index e1e8800..7ce1da8 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: 10up, helen, welcher, fabiankaegy, dinhtungdu, jeffpaul Tags: apple maps, map block, block Requires at least: 5.8 -Tested up to: 6.2 +Tested up to: 6.3 Requires PHP: 7.4 Stable tag: 1.1.1 License: GPLv2 or later From 8f8cc46bd8cfa0ee3f6adab8e8216b4dc27424d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:04:15 +0000 Subject: [PATCH 11/32] Bump @cypress/request and cypress Bumps [@cypress/request](https://github.com/cypress-io/request) to 3.0.0 and updates ancestor dependency [cypress](https://github.com/cypress-io/cypress). These dependencies need to be updated together. Updates `@cypress/request` from 2.88.12 to 3.0.0 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](https://github.com/cypress-io/request/compare/v2.88.12...v3.0.0) Updates `cypress` from 11.2.0 to 13.1.0 - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v11.2.0...v13.1.0) --- updated-dependencies: - dependency-name: "@cypress/request" dependency-type: indirect - dependency-name: cypress dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 108 ++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 71 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index f857ecf..d1daf5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@wordpress/env": "^5.6.0", "@wordpress/eslint-plugin": "^10.0.1", "@wordpress/scripts": "^24.6.0", - "cypress": "^11.0.0", + "cypress": "^13.1.0", "cypress-mochawesome-reporter": "^3.4.0" }, "engines": { @@ -1874,9 +1874,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -7523,15 +7523,15 @@ } }, "node_modules/cypress": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz", - "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -7543,10 +7543,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -7561,12 +7561,13 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -7576,7 +7577,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": ">=12.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-mochawesome-reporter": { @@ -7615,9 +7616,9 @@ } }, "node_modules/cypress/node_modules/@types/node": { - "version": "14.18.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.46.tgz", - "integrity": "sha512-n4yVT5FuY5NCcGHCosQSGvvCT74HhowymPN2OEcsHPw6U1NuxV9dvxWbrM2dnBukWjdMYzig1WfIkWdTTQJqng==", + "version": "16.18.46", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz", + "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==", "dev": true }, "node_modules/cypress/node_modules/ansi-styles": { @@ -7681,6 +7682,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/cypress/node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, "node_modules/cypress/node_modules/extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -7723,9 +7733,9 @@ } }, "node_modules/cypress/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -17632,6 +17642,15 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -22929,9 +22948,9 @@ "requires": {} }, "@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -27178,14 +27197,14 @@ } }, "cypress": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz", - "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -27197,10 +27216,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -27215,12 +27234,13 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -27228,9 +27248,9 @@ }, "dependencies": { "@types/node": { - "version": "14.18.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.46.tgz", - "integrity": "sha512-n4yVT5FuY5NCcGHCosQSGvvCT74HhowymPN2OEcsHPw6U1NuxV9dvxWbrM2dnBukWjdMYzig1WfIkWdTTQJqng==", + "version": "16.18.46", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz", + "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==", "dev": true }, "ansi-styles": { @@ -27278,6 +27298,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true + }, "extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -27306,9 +27332,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -34690,6 +34716,12 @@ } } }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", diff --git a/package.json b/package.json index 9490993..526fdef 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@wordpress/env": "^5.6.0", "@wordpress/eslint-plugin": "^10.0.1", "@wordpress/scripts": "^24.6.0", - "cypress": "^11.0.0", + "cypress": "^13.1.0", "cypress-mochawesome-reporter": "^3.4.0" } } From 2c13a8246b026d48e1180fb8ebac1e1f5fb5e28d Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Wed, 20 Sep 2023 15:26:01 +0530 Subject: [PATCH 12/32] Upgrade npm packages. --- package-lock.json | 249 +++++++++++++++++++++++++--------------------- package.json | 8 +- 2 files changed, 139 insertions(+), 118 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1daf5c..5e69779 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,22 +9,22 @@ "version": "1.1.1", "license": "GPL-2.0-only", "devDependencies": { - "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build", - "@wordpress/env": "^5.6.0", + "@10up/cypress-wp-utils": "^0.2.0", + "@wordpress/env": "^8.7.0", "@wordpress/eslint-plugin": "^10.0.1", "@wordpress/scripts": "^24.6.0", - "cypress": "^13.1.0", - "cypress-mochawesome-reporter": "^3.4.0" + "cypress": "^13.2.0", + "cypress-mochawesome-reporter": "^3.6.0" }, "engines": { "node": ">=12.0" } }, "node_modules/@10up/cypress-wp-utils": { - "version": "0.1.0", - "resolved": "git+ssh://git@github.com/10up/cypress-wp-utils.git#f5a2168bcc50cadab4b0f0e0903da544df15594e", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@10up/cypress-wp-utils/-/cypress-wp-utils-0.2.0.tgz", + "integrity": "sha512-5gzamtHIFojT+wx0OzSAEeVY6FVrlcVPHVFH23uExkaqQhNsJvrnpdtqtT98wAYkXg56c1qDN7Ju7ZRTaNzP5g==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.0" } @@ -3859,9 +3859,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4022,9 +4022,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4081,9 +4081,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4398,9 +4398,9 @@ } }, "node_modules/@wordpress/env": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.16.0.tgz", - "integrity": "sha512-zx6UO8PuJBrQ34cfeedK1HlGHLFaj7oWzTo9tTt+noB79Ttqc4+a0lYwDqBLLJhlHU+cWgcyOP2lB6TboXH0xA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-8.7.0.tgz", + "integrity": "sha512-cqjDjFFLZ8691mzsuPaakoNbUJ5d6DNNRMyN6UZefLGKhthlqmyK5DqzXZUzCr9cgF/kdc//v3ZmBy9nywBYSA==", "dev": true, "dependencies": { "chalk": "^4.0.0", @@ -5090,9 +5090,9 @@ } }, "node_modules/@wordpress/scripts/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -7309,9 +7309,9 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -7523,15 +7523,15 @@ } }, "node_modules/cypress": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", - "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", + "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "dev": true, "hasInstallScript": true, "dependencies": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", + "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -7581,16 +7581,20 @@ } }, "node_modules/cypress-mochawesome-reporter": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.4.0.tgz", - "integrity": "sha512-W+pBZt0QnAp0SZ5+laUJL+glQF+ry55wRUTENtOCchCDuwbGMxK5EkJQ1uktORVtDNhhjb92dX8dZireyInfQQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.6.0.tgz", + "integrity": "sha512-NeYpeZVB5YCU10I3a1yA2qHt+YREo0jZw4Gj83JTJ7YX/ZLFfd8MYKl2O19d/yYC8np/fpMufp5gt3ympd9DWQ==", "dev": true, "dependencies": { + "commander": "^10.0.1", "fs-extra": "^10.0.1", "mochawesome": "^7.1.3", "mochawesome-merge": "^4.2.1", "mochawesome-report-generator": "^6.2.0" }, + "bin": { + "generate-mochawesome-report": "cli.js" + }, "engines": { "node": ">=14" }, @@ -7601,6 +7605,15 @@ "cypress": ">=6.2.0" } }, + "node_modules/cypress-mochawesome-reporter/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/cypress-mochawesome-reporter/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -7616,9 +7629,9 @@ } }, "node_modules/cypress/node_modules/@types/node": { - "version": "16.18.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz", - "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==", + "version": "18.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz", + "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==", "dev": true }, "node_modules/cypress/node_modules/ansi-styles": { @@ -8987,9 +9000,9 @@ } }, "node_modules/eslint-plugin-jsdoc/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -13551,9 +13564,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -15934,9 +15947,9 @@ } }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -16088,9 +16101,9 @@ } }, "node_modules/npm-package-json-lint/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -17091,9 +17104,9 @@ } }, "node_modules/postcss-loader/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -18641,9 +18654,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -19667,9 +19680,9 @@ } }, "node_modules/stylelint/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -21434,9 +21447,9 @@ "dev": true }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -21674,9 +21687,10 @@ }, "dependencies": { "@10up/cypress-wp-utils": { - "version": "git+ssh://git@github.com/10up/cypress-wp-utils.git#f5a2168bcc50cadab4b0f0e0903da544df15594e", - "dev": true, - "from": "@10up/cypress-wp-utils@github:10up/cypress-wp-utils#build" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@10up/cypress-wp-utils/-/cypress-wp-utils-0.2.0.tgz", + "integrity": "sha512-5gzamtHIFojT+wx0OzSAEeVY6FVrlcVPHVFH23uExkaqQhNsJvrnpdtqtT98wAYkXg56c1qDN7Ju7ZRTaNzP5g==", + "dev": true }, "@ampproject/remapping": { "version": "2.2.1", @@ -24500,9 +24514,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -24590,9 +24604,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -24632,9 +24646,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -24901,9 +24915,9 @@ } }, "@wordpress/env": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.16.0.tgz", - "integrity": "sha512-zx6UO8PuJBrQ34cfeedK1HlGHLFaj7oWzTo9tTt+noB79Ttqc4+a0lYwDqBLLJhlHU+cWgcyOP2lB6TboXH0xA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-8.7.0.tgz", + "integrity": "sha512-cqjDjFFLZ8691mzsuPaakoNbUJ5d6DNNRMyN6UZefLGKhthlqmyK5DqzXZUzCr9cgF/kdc//v3ZmBy9nywBYSA==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -25383,9 +25397,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -27034,9 +27048,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -27197,14 +27211,14 @@ } }, "cypress": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", - "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", + "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "dev": true, "requires": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", + "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -27248,9 +27262,9 @@ }, "dependencies": { "@types/node": { - "version": "16.18.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz", - "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==", + "version": "18.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz", + "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==", "dev": true }, "ansi-styles": { @@ -27358,17 +27372,24 @@ } }, "cypress-mochawesome-reporter": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.4.0.tgz", - "integrity": "sha512-W+pBZt0QnAp0SZ5+laUJL+glQF+ry55wRUTENtOCchCDuwbGMxK5EkJQ1uktORVtDNhhjb92dX8dZireyInfQQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.6.0.tgz", + "integrity": "sha512-NeYpeZVB5YCU10I3a1yA2qHt+YREo0jZw4Gj83JTJ7YX/ZLFfd8MYKl2O19d/yYC8np/fpMufp5gt3ympd9DWQ==", "dev": true, "requires": { + "commander": "^10.0.1", "fs-extra": "^10.0.1", "mochawesome": "^7.1.3", "mochawesome-merge": "^4.2.1", "mochawesome-report-generator": "^6.2.0" }, "dependencies": { + "commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true + }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -28451,9 +28472,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -31680,9 +31701,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -33540,9 +33561,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true } } @@ -33653,9 +33674,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -34384,9 +34405,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -35452,9 +35473,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "send": { @@ -36267,9 +36288,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -37612,9 +37633,9 @@ "dev": true }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true }, "workerpool": { diff --git a/package.json b/package.json index 526fdef..768d74b 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,11 @@ "node": ">=12.0" }, "devDependencies": { - "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build", - "@wordpress/env": "^5.6.0", + "@10up/cypress-wp-utils": "^0.2.0", + "@wordpress/env": "^8.7.0", "@wordpress/eslint-plugin": "^10.0.1", "@wordpress/scripts": "^24.6.0", - "cypress": "^13.1.0", - "cypress-mochawesome-reporter": "^3.4.0" + "cypress": "^13.2.0", + "cypress-mochawesome-reporter": "^3.6.0" } } From 1b6d167bd973984ff4ad6d4d51b076688f40f407 Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Wed, 20 Sep 2023 15:27:42 +0530 Subject: [PATCH 13/32] Upgrade e2e test files. --- tests/bin/initialize.sh | 4 ++-- tests/cypress/config.js | 8 +++++--- tests/cypress/e2e/block.test.js | 5 +---- tests/cypress/e2e/settings.test.js | 2 +- tests/cypress/support/e2e.js | 8 -------- 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/tests/bin/initialize.sh b/tests/bin/initialize.sh index 9d06a85..e9cb0f0 100755 --- a/tests/bin/initialize.sh +++ b/tests/bin/initialize.sh @@ -1,3 +1,3 @@ #!/bin/bash -npm run env run tests-wordpress "chmod -c ugo+w /var/www/html" -npm run env run tests-cli "wp rewrite structure '/%postname%/' --hard" +wp-env run tests-wordpress chmod -c ugo+w /var/www/html +wp-env run tests-cli wp rewrite structure '/%postname%/' --hard diff --git a/tests/cypress/config.js b/tests/cypress/config.js index 46fd20f..04d04a1 100644 --- a/tests/cypress/config.js +++ b/tests/cypress/config.js @@ -1,5 +1,6 @@ const { defineConfig } = require('cypress'); -const { readConfig } = require('@wordpress/env/lib/config'); +const { loadConfig } = require( '@wordpress/env/lib/config' ); +const getCacheDirectory = require( '@wordpress/env/lib/config/get-cache-directory' ); module.exports = defineConfig({ fixturesFolder: 'tests/cypress/fixtures', @@ -26,13 +27,14 @@ module.exports = defineConfig({ /** * Set WP URL as baseUrl in Cypress config. - * + * * @param {Function} on function that used to register listeners on various events. * @param {object} config Cypress Config object. * @returns config Updated Cypress Config object. */ const setBaseUrl = async (on, config) => { - const wpEnvConfig = await readConfig('wp-env'); + const cacheDirectory = await getCacheDirectory(); + const wpEnvConfig = await loadConfig( cacheDirectory ); if (wpEnvConfig) { const port = wpEnvConfig.env.tests.port || null; diff --git a/tests/cypress/e2e/block.test.js b/tests/cypress/e2e/block.test.js index f33199d..225f060 100644 --- a/tests/cypress/e2e/block.test.js +++ b/tests/cypress/e2e/block.test.js @@ -1,9 +1,6 @@ describe("Test block functions", () => { - before(() => { - cy.login(); - }); - beforeEach(() => { + cy.login(); cy.mapsBlockSaveSettings(); }); diff --git a/tests/cypress/e2e/settings.test.js b/tests/cypress/e2e/settings.test.js index ee02558..8e71b18 100644 --- a/tests/cypress/e2e/settings.test.js +++ b/tests/cypress/e2e/settings.test.js @@ -1,5 +1,5 @@ describe("Settings", () => { - before(() => { + beforeEach(() => { cy.login(); }); diff --git a/tests/cypress/support/e2e.js b/tests/cypress/support/e2e.js index c933e9a..45fb158 100644 --- a/tests/cypress/support/e2e.js +++ b/tests/cypress/support/e2e.js @@ -17,11 +17,3 @@ import "@10up/cypress-wp-utils"; // Import commands.js using ES2015 syntax: import "./commands"; - -// Alternatively you can use CommonJS syntax: -// require('./commands') -beforeEach(() => { - Cypress.Cookies.defaults({ - preserve: /^wordpress.*?/, - }); -}); From 479f1f137da07eeada1c2fe0286a643d2aff03ff Mon Sep 17 00:00:00 2001 From: Siddharth Thevaril Date: Thu, 28 Sep 2023 10:37:25 +0530 Subject: [PATCH 14/32] fix indentation --- tests/cypress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/config.js b/tests/cypress/config.js index 04d04a1..7d0cb50 100644 --- a/tests/cypress/config.js +++ b/tests/cypress/config.js @@ -33,7 +33,7 @@ module.exports = defineConfig({ * @returns config Updated Cypress Config object. */ const setBaseUrl = async (on, config) => { - const cacheDirectory = await getCacheDirectory(); + const cacheDirectory = await getCacheDirectory(); const wpEnvConfig = await loadConfig( cacheDirectory ); if (wpEnvConfig) { From ee070a3d157d7a85404fa6eb6981d48f4a04a0dc Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Wed, 4 Oct 2023 15:17:27 +0530 Subject: [PATCH 15/32] Fix block error in WP 6.4 --- src/edit.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/edit.js b/src/edit.js index 55c6fb1..a36acc5 100644 --- a/src/edit.js +++ b/src/edit.js @@ -222,12 +222,14 @@ export default function MapsBlockAppleEdit(props) { 'maps-block-apple' )} icon={BlockIcon} - instructions={ - + isColumnLayout={true} + > + +
{__( 'In order to include an Apple Map on your website you need to confirm your MapKit credentials below. Here is documentation on how to get those credentials: ', 'maps-block-apple' @@ -241,12 +243,8 @@ export default function MapsBlockAppleEdit(props) { 'Instructions for creating your MapKit credentials.', 'maps-block-apple' )} - {' '} - - } - isColumnLayout={true} - > - + +
From d3d85dd74645f8bd133f47faacd4a3adc803d2e6 Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Wed, 4 Oct 2023 16:14:32 +0530 Subject: [PATCH 16/32] Added text domain. --- src/edit.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/edit.js b/src/edit.js index a36acc5..e062798 100644 --- a/src/edit.js +++ b/src/edit.js @@ -226,7 +226,8 @@ export default function MapsBlockAppleEdit(props) { >
From b59f5005b3b42800edab3596b0498b07ebf18e1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 01:02:55 +0000 Subject: [PATCH 17/32] Bump postcss from 8.4.23 to 8.4.31 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.23 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.23...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5e69779..a449fca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16947,9 +16947,9 @@ } }, "node_modules/postcss": { - "version": "8.4.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz", - "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -34306,9 +34306,9 @@ } }, "postcss": { - "version": "8.4.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz", - "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", From c6468ff48230644593ba949e47cec1d7b157bea6 Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 17:01:52 +0530 Subject: [PATCH 18/32] chore: install environmet validation composer packgae --- .gitignore | 2 ++ composer.json | 77 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 9ac0565..c7c2626 100755 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ tests/cypress/downloads tests/cypress/screenshots tests/cypress/videos tests/cypress/reports + +10up-lib/ diff --git a/composer.json b/composer.json index 79a5e2d..c6013a8 100644 --- a/composer.json +++ b/composer.json @@ -1,30 +1,51 @@ { - "name": "10up/maps-block-apple", - "description": "WordPress editor block for Apple Maps", - "version": "1.0.1", - "type": "wordpress-plugin", - "homepage": "https://10up.com", - "license": "GPLv2 or later", - "authors": [ - { - "name": "10up", - "email": "opensource@10up.com", - "homepage": "https://10up.com", - "role": "Developer" - } - ], - "require-dev": { - "10up/phpcs-composer": "dev-master" - }, - "scripts": { - "lint": "./vendor/bin/phpcs", - "lint-fix": "./vendor/bin/phpcbf --extensions=php .", - "phpcs:compat": "vendor/bin/phpcs maps-block-apple.php includes/ -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-" - }, - "minimum-stability": "dev", - "config": { - "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true - } - } + "name": "10up/maps-block-apple", + "description": "WordPress editor block for Apple Maps", + "version": "1.0.1", + "type": "wordpress-plugin", + "homepage": "https://10up.com", + "license": "GPLv2 or later", + "authors": [ + { + "name": "10up", + "email": "opensource@10up.com", + "homepage": "https://10up.com", + "role": "Developer" + } + ], + "require": { + "10up/wp-compat-validation-tool": "dev-trunk" + }, + "require-dev": { + "10up/phpcs-composer": "dev-master" + }, + "scripts": { + "lint": "./vendor/bin/phpcs", + "lint-fix": "./vendor/bin/phpcbf --extensions=php .", + "phpcs:compat": "vendor/bin/phpcs maps-block-apple.php includes/ -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-", + "post-install-cmd": [ + "./10up-lib/wp-compat-validation-tool/replace-namespace.sh TenUP_Maps_Block_Apple_Environment_Validation_Tools" + ], + "post-update-cmd": [ + "./10up-lib/wp-compat-validation-tool/replace-namespace.sh TenUP_Maps_Block_Apple_Environment_Validation_Tools" + ] + }, + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "composer/installers": true + } + }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/10up/wp-compat-validation-tool.git" + } + ], + "extra": { + "installer-paths": { + "./{$name}/": ["10up/wp-compat-validation-tool"] + } + } } From d60d3ea1f2115ecedb39fb79f3b650d875f8104c Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 17:22:34 +0530 Subject: [PATCH 19/32] feat: use 10up wp-compat-validation-toll lib for php validation --- includes/environment-validation.php | 23 +++++++++++++++ maps-block-apple.php | 43 +++-------------------------- 2 files changed, 27 insertions(+), 39 deletions(-) create mode 100644 includes/environment-validation.php diff --git a/includes/environment-validation.php b/includes/environment-validation.php new file mode 100644 index 0000000..8c42306 --- /dev/null +++ b/includes/environment-validation.php @@ -0,0 +1,23 @@ +set_plugin_name( 'Block for Apple Maps' ) + ->set_php_min_required_version( '7.4' ); + +if ( ! $compat_checker->is_plugin_compatible() ) { + return false; +} + +return true; diff --git a/maps-block-apple.php b/maps-block-apple.php index 69c0ee4..e636c06 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -24,49 +24,14 @@ define( 'MAPS_BLOCK_APPLE_INC', MAPS_BLOCK_APPLE_PATH . 'includes/' ); define( 'MAPS_BLOCK_APPLE_BASENAME', plugin_basename( __FILE__ ) ); -/** - * Get the minimum version of PHP required by this plugin. - * - * @return string Minimum version required. - */ -function minimum_php_requirement() { - return '7.4'; -} - -/** - * Whether PHP installation meets the minimum requirements - * - * @return bool True if meets minimum requirements, false otherwise. - */ -function site_meets_php_requirements() { - return version_compare( phpversion(), minimum_php_requirement(), '>=' ); -} -// Ensuring our PHP version requirement is met first before loading plugin. -if ( ! site_meets_php_requirements() ) { - add_action( - 'admin_notices', - function() { - ?> -
-

- -

-
- Date: Wed, 11 Oct 2023 18:04:34 +0530 Subject: [PATCH 20/32] dev: update build release zip workflow insrall composer packages. --- .github/workflows/build-release-zip.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-release-zip.yml b/.github/workflows/build-release-zip.yml index 04a7ac6..4274862 100644 --- a/.github/workflows/build-release-zip.yml +++ b/.github/workflows/build-release-zip.yml @@ -24,6 +24,9 @@ jobs: path: node_modules key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + - name: Install Composer dependencies + run: composer install --no-dev + - name: Setup node version and npm cache uses: actions/setup-node@v3 with: From 456f6a8e0135c1ba390a1d903a6066fbd96ec30e Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 18:05:07 +0530 Subject: [PATCH 21/32] doc: add file description --- includes/environment-validation.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/environment-validation.php b/includes/environment-validation.php index 8c42306..292ff46 100644 --- a/includes/environment-validation.php +++ b/includes/environment-validation.php @@ -1,5 +1,9 @@ Date: Wed, 11 Oct 2023 18:10:01 +0530 Subject: [PATCH 22/32] format: improve code formatting --- .phpcs.xml | 3 ++- includes/environment-validation.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.phpcs.xml b/.phpcs.xml index 3c7adde..28a6003 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -10,4 +10,5 @@ build node_modules vendor - \ No newline at end of file + 10up-lib + diff --git a/includes/environment-validation.php b/includes/environment-validation.php index 292ff46..84c4342 100644 --- a/includes/environment-validation.php +++ b/includes/environment-validation.php @@ -2,8 +2,10 @@ /** * This file is used to validate the environment. * + * @package tenup\Maps_Block_Apple * @since x.x.x */ + namespace tenup\Maps_Block_Apple; use TenUP_Maps_Block_Apple_Environment_Validation_Tools\Validator; From c951c7a0a0fbfe1c7065c30e2f9d72ff993a13ad Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 18:21:23 +0530 Subject: [PATCH 23/32] format: improve code formatting --- includes/environment-validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/environment-validation.php b/includes/environment-validation.php index 84c4342..cc2c254 100644 --- a/includes/environment-validation.php +++ b/includes/environment-validation.php @@ -3,7 +3,7 @@ * This file is used to validate the environment. * * @package tenup\Maps_Block_Apple - * @since x.x.x + * @since x.x.x */ namespace tenup\Maps_Block_Apple; From adb055514ff7458d292aa581618c642a7d53dee9 Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 18:22:24 +0530 Subject: [PATCH 24/32] format: improve code formatting --- maps-block-apple.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps-block-apple.php b/maps-block-apple.php index e636c06..92493b4 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -27,7 +27,7 @@ // Validate Environment. $is_environment_satisfy = require MAPS_BLOCK_APPLE_INC . 'environment-validation.php'; -if( ! $is_environment_satisfy ) { +if ( ! $is_environment_satisfy ) { return; } From 44a0687096e23b16c2f42191587113dd6642903a Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 20:35:04 +0530 Subject: [PATCH 25/32] dev: install composer for WordPress release workflow --- .github/workflows/deploy-to-wordpress-org.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-to-wordpress-org.yml b/.github/workflows/deploy-to-wordpress-org.yml index 05d4249..a24830b 100644 --- a/.github/workflows/deploy-to-wordpress-org.yml +++ b/.github/workflows/deploy-to-wordpress-org.yml @@ -9,6 +9,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@master + - name: Install Composer dependencies + run: composer install --no-dev - name: Build run: | npm install From 166cd504b79ee76a7e5e0c1a68423ca5ee98d241 Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Wed, 11 Oct 2023 20:37:31 +0530 Subject: [PATCH 26/32] dev: use latest E2E workflow config to check E2E tests --- .github/workflows/cypress.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index ae64642..0264f36 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -5,8 +5,8 @@ on: branches: - develop jobs: - build: - uses: 10up/maps-block-apple/.github/workflows/build-release-zip.yml@develop + build: + uses: 10up/maps-block-apple/.github/workflows/build-release-zip.yml@fix/172-php-ver-check cypress: needs: build name: ${{ matrix.core.name }} @@ -42,7 +42,7 @@ jobs: key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - name: Install dependencies run: npm install - - name: Set the core version and plugins config + - name: Set the core version and plugins config run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }} - name: Set up WP environment run: npm run env:start From 39a71baed3b3a5a8b9be0c7ca8001d40b965b516 Mon Sep 17 00:00:00 2001 From: Ravinder Kumar Date: Thu, 12 Oct 2023 09:00:34 +0530 Subject: [PATCH 27/32] chore: cleanup --- .github/workflows/cypress.yml | 2 +- includes/environment-validation.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 0264f36..e828547 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -6,7 +6,7 @@ on: - develop jobs: build: - uses: 10up/maps-block-apple/.github/workflows/build-release-zip.yml@fix/172-php-ver-check + uses: 10up/maps-block-apple/.github/workflows/build-release-zip.yml@develop cypress: needs: build name: ${{ matrix.core.name }} diff --git a/includes/environment-validation.php b/includes/environment-validation.php index cc2c254..7a5fead 100644 --- a/includes/environment-validation.php +++ b/includes/environment-validation.php @@ -3,7 +3,7 @@ * This file is used to validate the environment. * * @package tenup\Maps_Block_Apple - * @since x.x.x + * @since 1.2.0 */ namespace tenup\Maps_Block_Apple; From 941dd5e4cc612a3807317635daefaa4b7b545bd5 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 13 Oct 2023 09:17:06 -0600 Subject: [PATCH 28/32] Version bump to 1.1.2 --- maps-block-apple.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maps-block-apple.php b/maps-block-apple.php index 92493b4..f91f34c 100644 --- a/maps-block-apple.php +++ b/maps-block-apple.php @@ -3,7 +3,7 @@ * Plugin Name: Block for Apple Maps * Plugin URI: https://github.com/10up/maps-block-apple * Description: An Apple Maps block for the WordPress block editor (Gutenberg). - * Version: 1.1.1 + * Version: 1.1.2 * Requires at least: 5.8 * Requires PHP: 7.4 * Author: 10up @@ -18,7 +18,7 @@ namespace tenup\Maps_Block_Apple; // Useful global constants. -define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.1' ); +define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.2' ); define( 'MAPS_BLOCK_APPLE_URL', plugin_dir_url( __FILE__ ) ); define( 'MAPS_BLOCK_APPLE_PATH', dirname( __FILE__ ) . '/' ); define( 'MAPS_BLOCK_APPLE_INC', MAPS_BLOCK_APPLE_PATH . 'includes/' ); diff --git a/package-lock.json b/package-lock.json index dee0b66..38ef194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "maps-block-apple", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "maps-block-apple", - "version": "1.1.1", + "version": "1.1.2", "license": "GPL-2.0-only", "devDependencies": { "@10up/cypress-wp-utils": "^0.2.0", diff --git a/package.json b/package.json index 768d74b..cd8d634 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "maps-block-apple", - "version": "1.1.1", + "version": "1.1.2", "description": "An Apple Maps block for the WordPress block editor (Gutenberg).", "author": { "name": "10up", diff --git a/readme.txt b/readme.txt index 7ce1da8..e3060df 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: apple maps, map block, block Requires at least: 5.8 Tested up to: 6.3 Requires PHP: 7.4 -Stable tag: 1.1.1 +Stable tag: 1.1.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html From c512aff61e06cf22f1f1af7fd3f190f3e5db74a0 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 13 Oct 2023 09:31:30 -0600 Subject: [PATCH 29/32] Update changelog --- CHANGELOG.md | 20 ++++++++++++++++++++ readme.txt | 14 ++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 911ee19..2b2d562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [1.1.2] - 2023-10-16 +### Changed +- Bump WordPress "tested up to" version to 6.3 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul) via [#179](https://github.com/10up/maps-block-apple/pull/179)). + +### Fixed +- Ensure our Mapkit JS only loads when a Map block is in place (props [@jayedul](https://github.com/jayedul), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#161](https://github.com/10up/maps-block-apple/pull/161)). +- Better error handling for environments that don't match our minimum PHP version (props [@rahulsprajapati](https://github.com/rahulsprajapati), [@dkotter](https://github.com/dkotter), [@ravinderk](https://github.com/ravinderk) via [#174](https://github.com/10up/maps-block-apple/pull/174)). +- Ensure that the Apple Maps block works fine in WordPress 6.4 (props [@iamdharmesh](https://github.com/iamdharmesh), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#183](https://github.com/10up/maps-block-apple/pull/183)). +- Ensure that our Cypress E2E tests pass (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). + +### Security +- Bump `word-wrap` from 1.2.3 to 1.2.4 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#173](https://github.com/10up/maps-block-apple/pull/173)). +- Bump `tough-cookie` from 4.1.2 to 4.1.3 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/apps/faisal-alvi) via [#176](https://github.com/10up/maps-block-apple/pull/176)). +- Bump `cypress` from 11.2.0 to 13.2.0 and `@cypress/request` from 2.88.11 to 3.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk), [@faisal-alvi](https://github.com/apps/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#176](https://github.com/10up/maps-block-apple/pull/176), [#180](https://github.com/10up/maps-block-apple/pull/180), [#181](https://github.com/10up/maps-block-apple/pull/181)). +- Bump `postcss` from 8.4.23 to 8.4.31 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#184](https://github.com/10up/maps-block-apple/pull/184)). +- Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +- Bump `@wordpress/env` from 5.6.0 to 8.7.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +- Bump `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). + ## [1.1.1] - 2023-06-21 **Note that this release bumps the PHP minimum supported version from 5.6 to 7.4.** @@ -126,6 +145,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Initial private release of Block for Apple Maps plugin. [Unreleased]: https://github.com/10up/maps-block-apple/compare/trunk...develop +[1.1.2]: https://github.com/10up/maps-block-apple/compare/1.1.1...1.1.2 [1.1.1]: https://github.com/10up/maps-block-apple/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/10up/maps-block-apple/compare/1.0.3...1.1.0 [1.0.3]: https://github.com/10up/maps-block-apple/compare/1.0.2...1.0.3 diff --git a/readme.txt b/readme.txt index e3060df..38983c6 100644 --- a/readme.txt +++ b/readme.txt @@ -72,6 +72,20 @@ Yes, you can track your MapKit JS useage on the [MapKit JS Developer Dashboard]( == Changelog == += 1.1.2 - 2023-10-16 = +* **Changed:** Bump WordPress "tested up to" version to 6.3 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul) via [#179](https://github.com/10up/maps-block-apple/pull/179)). +* **Fixed:** Ensure our Mapkit JS only loads when a Map block is in place (props [@jayedul](https://github.com/jayedul), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#161](https://github.com/10up/maps-block-apple/pull/161)). +* **Fixed:** Better error handling for environments that don't match our minimum PHP version (props [@rahulsprajapati](https://github.com/rahulsprajapati), [@dkotter](https://github.com/dkotter), [@ravinderk](https://github.com/ravinderk) via [#174](https://github.com/10up/maps-block-apple/pull/174)). +* **Fixed:** Ensure that the Apple Maps block works fine in WordPress 6.4 (props [@iamdharmesh](https://github.com/iamdharmesh), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#183](https://github.com/10up/maps-block-apple/pull/183)). +* **Fixed:** Ensure that our Cypress E2E tests pass (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +* **Security:** Bump `word-wrap` from 1.2.3 to 1.2.4 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#173](https://github.com/10up/maps-block-apple/pull/173)). +* **Security:** Bump `tough-cookie` from 4.1.2 to 4.1.3 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/apps/faisal-alvi) via [#176](https://github.com/10up/maps-block-apple/pull/176)). +* **Security:** Bump `cypress` from 11.2.0 to 13.2.0 and `@cypress/request` from 2.88.11 to 3.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk), [@faisal-alvi](https://github.com/apps/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#176](https://github.com/10up/maps-block-apple/pull/176), [#180](https://github.com/10up/maps-block-apple/pull/180), [#181](https://github.com/10up/maps-block-apple/pull/181)). +* **Security:** Bump `postcss` from 8.4.23 to 8.4.31 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#184](https://github.com/10up/maps-block-apple/pull/184)). +* **Security:** Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +* **Security:** Bump `@wordpress/env` from 5.6.0 to 8.7.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +* **Security:** Bump `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). + = 1.1.1 - 2023-06-21 = * **Note that this release bumps the PHP minimum supported version from 5.6 to 7.4.** From e907d5464550a4f8237dc797ca4d65da744218eb Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 13 Oct 2023 09:34:02 -0600 Subject: [PATCH 30/32] Update CREDITS.md --- CREDITS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index 79436cf..d2ce474 100644 --- a/CREDITS.md +++ b/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. -[Helen Hou-Sandi (@helen)](https://github.com/helen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Ankit K. Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Crisoforo Gaspar Hernández (@mitogh)](https://github.com/mitogh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Max Lyuchin (@cadic)](https://github.com/cadic), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Curtis Loisel (@csloisel)](https://github.com/csloisel) +[Helen Hou-Sandi (@helen)](https://github.com/helen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Ankit K. Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Crisoforo Gaspar Hernández (@mitogh)](https://github.com/mitogh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Max Lyuchin (@cadic)](https://github.com/cadic), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu), [Rahul Prajapati (@rahulsprajapati)](https://github.com/rahulsprajapati), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk). ## Libraries From b3a1cb9ed2c3348ab9cac91c5882a959a0c4fd4c Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 13 Oct 2023 10:26:56 -0600 Subject: [PATCH 31/32] Simplify changelog --- CHANGELOG.md | 4 +--- readme.txt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b2d562..316eac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,9 +19,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Bump `tough-cookie` from 4.1.2 to 4.1.3 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/apps/faisal-alvi) via [#176](https://github.com/10up/maps-block-apple/pull/176)). - Bump `cypress` from 11.2.0 to 13.2.0 and `@cypress/request` from 2.88.11 to 3.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk), [@faisal-alvi](https://github.com/apps/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#176](https://github.com/10up/maps-block-apple/pull/176), [#180](https://github.com/10up/maps-block-apple/pull/180), [#181](https://github.com/10up/maps-block-apple/pull/181)). - Bump `postcss` from 8.4.23 to 8.4.31 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#184](https://github.com/10up/maps-block-apple/pull/184)). -- Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). -- Bump `@wordpress/env` from 5.6.0 to 8.7.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). -- Bump `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +- Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0, `@wordpress/env` from 5.6.0 to 8.7.0 and `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). ## [1.1.1] - 2023-06-21 **Note that this release bumps the PHP minimum supported version from 5.6 to 7.4.** diff --git a/readme.txt b/readme.txt index 38983c6..1087a03 100644 --- a/readme.txt +++ b/readme.txt @@ -82,9 +82,7 @@ Yes, you can track your MapKit JS useage on the [MapKit JS Developer Dashboard]( * **Security:** Bump `tough-cookie` from 4.1.2 to 4.1.3 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/apps/faisal-alvi) via [#176](https://github.com/10up/maps-block-apple/pull/176)). * **Security:** Bump `cypress` from 11.2.0 to 13.2.0 and `@cypress/request` from 2.88.11 to 3.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk), [@faisal-alvi](https://github.com/apps/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#176](https://github.com/10up/maps-block-apple/pull/176), [#180](https://github.com/10up/maps-block-apple/pull/180), [#181](https://github.com/10up/maps-block-apple/pull/181)). * **Security:** Bump `postcss` from 8.4.23 to 8.4.31 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#184](https://github.com/10up/maps-block-apple/pull/184)). -* **Security:** Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). -* **Security:** Bump `@wordpress/env` from 5.6.0 to 8.7.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). -* **Security:** Bump `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). +* **Security:** Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0, `@wordpress/env` from 5.6.0 to 8.7.0 and `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)). = 1.1.1 - 2023-06-21 = * **Note that this release bumps the PHP minimum supported version from 5.6 to 7.4.** From 2549d614973b44c0e9b14364b7cfb0265a40378c Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Mon, 16 Oct 2023 08:54:04 -0600 Subject: [PATCH 32/32] Remove older changelog entries and direct people to github.com for those --- readme.txt | 48 ++---------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) diff --git a/readme.txt b/readme.txt index 1087a03..2c1c719 100644 --- a/readme.txt +++ b/readme.txt @@ -114,52 +114,8 @@ Yes, you can track your MapKit JS useage on the [MapKit JS Developer Dashboard]( * **Security:** Bump `simple-git` from 3.10.0 to 3.15.1 (props [@dependabot](https://github.com/apps/dependabot) via [#149](https://github.com/10up/maps-block-apple/pull/149)). * **Security:** Bump `json5` from 1.0.1 to 1.0.2 (props [@dependabot](https://github.com/apps/dependabot) via [#153](https://github.com/10up/maps-block-apple/pull/153)). -= 1.0.3 - 2022-06-27 = -* **Added:** Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#121](https://github.com/10up/maps-block-apple/pull/121)). -* **Changed:** Update UI of settings sidebar to make it feel more native (props [@fabiankaegy](https://github.com/fabiankaegy) , [@Sidsector9](https://github.com/Sidsector9) via [#115](https://github.com/10up/maps-block-apple/pull/115)). -* **Changed:** Bump WordPress version "tested up to" 6.0 (props [@cadic](https://github.com/cadic) via [#125](https://github.com/10up/maps-block-apple/pull/125)). -* **Changed:** Rename linting workflow (props [@dinhtungdu](https://github.com/dinhtungdu) via [#124](https://github.com/10up/maps-block-apple/pull/124)). -* **Security:** Bump `follow-redirects` from 1.14.4 to 1.14.8 (props [@dependabot](https://github.com/apps/dependabot) via [#114](https://github.com/10up/maps-block-apple/pull/114)). -* **Security:** Bump `nanoid` from 3.1.30 to 3.3.1 (props [@dependabot](https://github.com/apps/dependabot) via [#116](https://github.com/10up/maps-block-apple/pull/116)). -* **Security:** Bump `minimist` from 1.2.5 to 1.2.6 (props [@dependabot](https://github.com/apps/dependabot) via [#118](https://github.com/10up/maps-block-apple/pull/118)). -* **Security:** Bump `node-forge` from 1.2.1 to 1.3.1 (props [@dependabot](https://github.com/apps/dependabot) via [#119](https://github.com/10up/maps-block-apple/pull/119)). -* **Security:** Bump `async` from 2.6.3 to 2.6.4 (props [@dependabot](https://github.com/apps/dependabot) via [#123](https://github.com/10up/maps-block-apple/pull/123)). - -= 1.0.2 - 2022-01-27 = -* **Added:** `wp env` for local development (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul)). -* **Added:** Issue management automation via GitHub Actions (props [@jeffpaul](https://github.com/jeffpaul)). -* **Changed:** Bump WordPress version "tested up to" 5.9 (props [@jeffpaul](https://github.com/jeffpaul), [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@barneyjeffries](https://github.com/barneyjeffries)). -* **Changed:**Turn off `autoComplete` for the search input field (props [@dinhtungdu](https://github.com/dinhtungdu)). -* **Fixed:** `block.json` syntax error (props [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul), [@ryanwelcher](https://github.com/ryanwelcher)). -* **Fixed:** Enqueue map assets only when being used and clean up unused assets (props [@joshuaabenazer](https://github.com/joshuaabenazer), [@fabiankaegy](https://github.com/fabiankaegy)). -* **Fixed:** Remove orign restriction in local environments to allow for proxied domains (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu)). -* **Fixed:** Block not working in Site Editor due to iframed editor (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu)). -* **Fixed:** Search popover sizing (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@ankitguptaindia](https://github.com/ankitguptaindia)). -* **Security:** Bump `ini` from 1.3.5 to 1.3.8 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `elliptic` from 6.5.3 to 6.5.4 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `y18n` from 4.0.0 to 4.0.1 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `ssri` from 6.0.1 to 6.0.2 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `lodash` from 4.17.19 to 4.17.21 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `hosted-git-info` from 2.8.8 to 2.8.9 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `normalize-url` from 4.5.0 to 4.5.1 (props [@dependabot](https://github.com/apps/dependabot)). -* **Security:** Bump `path-parse` from 1.0.6 to 1.0.7 (props [@dependabot](https://github.com/apps/dependabot)). - -= 1.0.1 - 2020-08-11 = -* **Added:** Internationalization support via loading translations for the block (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@helen](https://profiles.wordpress.org/helen/) via [#69](https://github.com/10up/maps-block-apple/pull/69)) -* **Added:** WordPress.org Block Directory integration (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul/) via [#63](https://github.com/10up/maps-block-apple/pull/63)) -* **Added:** Documentation and GitHub Action updates (props [@helen](https://profiles.wordpress.org/helen/), [@jeffpaul](https://profiles.wordpress.org/jeffpaul/) via [#59](https://github.com/10up/maps-block-apple/pull/59), [#60](https://github.com/10up/maps-block-apple/pull/60), [#68](https://github.com/10up/maps-block-apple/pull/68)) -* **Fixed:** Debounce `addMarker` call when marker settings are changed (props [@fabiankaegy](https://profiles.wordpress.org/fabiankaegy/), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/) via [#70](https://github.com/10up/maps-block-apple/pull/70)) -* **Fixed:** Key and Team ID settings placeholders (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@helen](https://profiles.wordpress.org/helen/), [@jeffpaul](https://profiles.wordpress.org/jeffpaul/) via [#57](https://github.com/10up/maps-block-apple/pull/57)) -* **Security:** Bump `lodash` from 4.17.15 to 4.17.19 (props [@dependabot](https://github.com/apps/dependabot) via [#67](https://github.com/10up/maps-block-apple/pull/67)) -* **Security:** Bump `elliptic` from 6.5.2 to 6.5.3 (props [@dependabot](https://github.com/apps/dependabot) via [#71](https://github.com/10up/maps-block-apple/pull/71)) - -= 1.0.0 - 2020-06-25 = -🎉 Initial public release! - -Block for Apple Maps gives you an easy way to add MapKit-powered maps with custom markers to your site. For all of the technical details, please see the [full changelog](https://github.com/10up/maps-block-apple/blob/develop/CHANGELOG.md). - -= 0.1.0 - 2020-05-13 = -* Initial private release of Block for Apple Maps plugin. += Earlier versions = +For the changelog of earlier versions, please refer to the [changelog on github.com](https://github.com/10up/maps-block-apple/blob/develop/CHANGELOG.md). == Upgrade Notice ==