From 6e111f17d44b399cd723ea9ed96c87cff2169211 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 23 Jan 2024 11:11:56 -0500 Subject: [PATCH 1/6] set exact module versions in composer for clarity --- composer.json | 6 +++--- composer.lock | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 812d98eca..6799dc4ae 100644 --- a/composer.json +++ b/composer.json @@ -67,10 +67,10 @@ }, "require": { "newfold-labs/wp-module-business-reviews": "^1.1.1", - "newfold-labs/wp-module-coming-soon": "^1.1", + "newfold-labs/wp-module-coming-soon": "^1.1.17", "newfold-labs/wp-module-ctb": "^1.1.2", "newfold-labs/wp-module-customer-bluehost": "^1.6.0", - "newfold-labs/wp-module-data": "^2.4.16", + "newfold-labs/wp-module-data": "^2.4.17", "newfold-labs/wp-module-deactivation": "^1.0.4", "newfold-labs/wp-module-ecommerce": "1.3.18", "newfold-labs/wp-module-global-ctb": "^1.0.9", @@ -79,7 +79,7 @@ "newfold-labs/wp-module-marketplace": "^2.2.0", "newfold-labs/wp-module-notifications": "^1.2.2", "newfold-labs/wp-module-onboarding": "^1.12.0", - "newfold-labs/wp-module-patterns": "^0.1.12", + "newfold-labs/wp-module-patterns": "^0.1.13", "newfold-labs/wp-module-performance": "^1.3.0", "newfold-labs/wp-module-runtime": "^1.0.7", "newfold-labs/wp-module-secure-passwords": "^1.1", diff --git a/composer.lock b/composer.lock index f7ee8425c..178050a4a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "edf012a9b787f3ee22f67e27a643676e", + "content-hash": "ca74bcc3fde97e4d9380daada719bd92", "packages": [ { "name": "doctrine/inflector", @@ -3675,5 +3675,5 @@ "platform-overrides": { "php": "7.1.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 6a709d37d7e99fa9d9dc8a24d54a16acb16c7294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:41:52 +0000 Subject: [PATCH 2/6] Composer(deps): Bump newfold-labs/wp-module-data from 2.4.17 to 2.4.18 Bumps [newfold-labs/wp-module-data](https://github.com/newfold-labs/wp-module-data) from 2.4.17 to 2.4.18. - [Release notes](https://github.com/newfold-labs/wp-module-data/releases) - [Commits](https://github.com/newfold-labs/wp-module-data/compare/2.4.17...2.4.18) --- updated-dependencies: - dependency-name: newfold-labs/wp-module-data dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6799dc4ae..42f537d75 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "newfold-labs/wp-module-coming-soon": "^1.1.17", "newfold-labs/wp-module-ctb": "^1.1.2", "newfold-labs/wp-module-customer-bluehost": "^1.6.0", - "newfold-labs/wp-module-data": "^2.4.17", + "newfold-labs/wp-module-data": "^2.4.18", "newfold-labs/wp-module-deactivation": "^1.0.4", "newfold-labs/wp-module-ecommerce": "1.3.18", "newfold-labs/wp-module-global-ctb": "^1.0.9", diff --git a/composer.lock b/composer.lock index 178050a4a..838e06036 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ca74bcc3fde97e4d9380daada719bd92", + "content-hash": "1a93435b35c34517d146076da3fe9700", "packages": [ { "name": "doctrine/inflector", @@ -421,16 +421,16 @@ }, { "name": "newfold-labs/wp-module-data", - "version": "2.4.17", + "version": "2.4.18", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-data.git", - "reference": "b544541bf20067d83b1a2ac4feb815e69ef113b3" + "reference": "f7bdfc1f70a2608c1ddaa6e3273221a880b794ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/b544541bf20067d83b1a2ac4feb815e69ef113b3", - "reference": "b544541bf20067d83b1a2ac4feb815e69ef113b3", + "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/f7bdfc1f70a2608c1ddaa6e3273221a880b794ed", + "reference": "f7bdfc1f70a2608c1ddaa6e3273221a880b794ed", "shasum": "" }, "require": { @@ -463,10 +463,10 @@ ], "description": "Newfold Data Module", "support": { - "source": "https://github.com/newfold-labs/wp-module-data/tree/2.4.17", + "source": "https://github.com/newfold-labs/wp-module-data/tree/2.4.18", "issues": "https://github.com/newfold-labs/wp-module-data/issues" }, - "time": "2024-01-22T22:35:26+00:00" + "time": "2024-01-24T21:36:38+00:00" }, { "name": "newfold-labs/wp-module-deactivation", From 94d1b75fb6b93cc471615750fd2dc8710b42b184 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:42:36 +0000 Subject: [PATCH 3/6] GitHub Actions(deps): Bump peter-evans/repository-dispatch from 2 to 3 Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 2 to 3. - [Release notes](https://github.com/peter-evans/repository-dispatch/releases) - [Commits](https://github.com/peter-evans/repository-dispatch/compare/v2...v3) --- updated-dependencies: - dependency-name: peter-evans/repository-dispatch dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/satis-webhook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/satis-webhook.yml b/.github/workflows/satis-webhook.yml index c6d51c0a4..88ae6890b 100644 --- a/.github/workflows/satis-webhook.yml +++ b/.github/workflows/satis-webhook.yml @@ -22,7 +22,7 @@ jobs: run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v2 + uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.SATIS_WEBHOOK_TOKEN }} repository: bluehost/satis From fb6538b11296e3634f030efb4d1fdae3e973a8d3 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Fri, 26 Jan 2024 16:39:00 -0500 Subject: [PATCH 4/6] version bump --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 792427bf7..c0a774e18 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.8.2 + * Version: 3.8.3 * Requires at least: 6.0 * Requires PHP: 7.1 * Tested up to: 6.4.2 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.8.2' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.8.3' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index 8c3e9c64d..5e1dfe2e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.8.0", + "version": "3.8.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.8.0", + "version": "3.8.2", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.1", diff --git a/package.json b/package.json index 47bb5d4af..a41904be8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "license": "GPL-2.0-or-later", - "version": "3.8.2", + "version": "3.8.3", "private": true, "repository": { "type": "git", From 681db48108796aea63dbde958db6f6352f312919 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Fri, 26 Jan 2024 16:40:31 -0500 Subject: [PATCH 5/6] make coming soon updates per #906 --- src/app/pages/settings/comingSoon.js | 25 +++++++++++++++++-------- src/app/stylesheet.scss | 4 ++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/app/pages/settings/comingSoon.js b/src/app/pages/settings/comingSoon.js index 4e4c94573..9243541ba 100644 --- a/src/app/pages/settings/comingSoon.js +++ b/src/app/pages/settings/comingSoon.js @@ -66,11 +66,11 @@ const ComingSoon = () => { const getComingSoonSectionTitle = () => { const getStatus = () => { return comingSoon ? ( - - { __( 'Coming Soon', 'wp-plugin-bluehost' ) } + + { __( 'Not Live', 'wp-plugin-bluehost' ) } ) : ( - + { __( 'Live', 'wp-plugin-bluehost' ) } ); @@ -83,18 +83,27 @@ const ComingSoon = () => { ); }; + const getComingSoonSectionDescription = () => { + return comingSoon + ? __( + 'Turn off your "Coming Soon" page when you are ready to launch your website.', + 'wp-plugin-bluehost' + ) + : __( + 'Turn on your "Coming Soon" page when you need to make major changes to your website.', + 'wp-plugin-bluehost' + ); + }; + return (
Date: Fri, 26 Jan 2024 17:25:43 -0500 Subject: [PATCH 6/6] update coming soon module to 1.1.18 --- composer.json | 2 +- composer.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 42f537d75..5efae20a8 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ }, "require": { "newfold-labs/wp-module-business-reviews": "^1.1.1", - "newfold-labs/wp-module-coming-soon": "^1.1.17", + "newfold-labs/wp-module-coming-soon": "^1.1.18", "newfold-labs/wp-module-ctb": "^1.1.2", "newfold-labs/wp-module-customer-bluehost": "^1.6.0", "newfold-labs/wp-module-data": "^2.4.18", diff --git a/composer.lock b/composer.lock index 838e06036..eb0ccf5af 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1a93435b35c34517d146076da3fe9700", + "content-hash": "76c05051441555ef3d005914fa661fe5", "packages": [ { "name": "doctrine/inflector", @@ -272,19 +272,20 @@ }, { "name": "newfold-labs/wp-module-coming-soon", - "version": "1.1.17", + "version": "1.1.18", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-coming-soon.git", - "reference": "eac606ade15a8da188b6997ad72003ca7a47ffab" + "reference": "0c0126bf277a8126bf1993a456dc5ba931fab35b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/eac606ade15a8da188b6997ad72003ca7a47ffab", - "reference": "eac606ade15a8da188b6997ad72003ca7a47ffab", + "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/0c0126bf277a8126bf1993a456dc5ba931fab35b", + "reference": "0c0126bf277a8126bf1993a456dc5ba931fab35b", "shasum": "" }, "require": { + "newfold-labs/wp-module-data": ">=2.4.18", "wp-forge/wp-upgrade-handler": "^1.0" }, "require-dev": { @@ -318,10 +319,10 @@ ], "description": "Coming Soon module for WordPress sites.", "support": { - "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.1.17", + "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.1.18", "issues": "https://github.com/newfold-labs/wp-module-coming-soon/issues" }, - "time": "2024-01-18T01:07:49+00:00" + "time": "2024-01-26T22:14:54+00:00" }, { "name": "newfold-labs/wp-module-ctb",