Merge pull request #1 from newfold-labs/update/repo-org

Update/repo org
newfold-labs · Dec 20, 2024 · 7cf6c8e · 7cf6c8e
2 parents 6cf3ecb + 892916f
commit 7cf6c8e
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 123 deletions.
diff --git a/.github/workflows/cloudflare-clear-cache.yml b/.github/workflows/cloudflare-clear-cache.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clear cache for release API
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
         run: |
           curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID }}/purge_cache" \
                -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \
                -H "Content-Type: application/json" \
-               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/bluehost/bluehost-wordpress-plugin"]}'
+               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-bluehost"]}'
 
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -118,11 +118,11 @@ jobs:
           command: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        if: ${{ github.repository != 'newfold-labs/wp-plugin-bluehost' || github.actor == 'dependabot[bot]' }}
         run: npm run test:e2e -- --browser chrome
 
       - name: Run Cypress Tests
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' && github.actor != 'dependabot[bot]' }}
         run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag "bluehost,php-${{ matrix.phpVersion }},wp-${{ matrix.wpVersion }}"
 
       - name: Store screenshots of test failures

diff --git a/.github/workflows/cypress-tests-beta.yml b/.github/workflows/cypress-tests-beta.yml
@@ -99,7 +99,7 @@ jobs:
         run: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
         run: npm run test:e2e -- --browser chrome
 
       - name: Store screenshots of test failures

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -106,11 +106,11 @@ jobs:
           command: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        if: ${{ github.repository != 'newfold-labs/wp-plugin-bluehost' || github.actor == 'dependabot[bot]' }}
         run: npm run test:e2e -- --browser chrome
 
-      - name: Run Cypress Tests
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
+      - name: Run Cypress Tests (and record)
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' && github.actor != 'dependabot[bot]' }}
         run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag bluehost
 
       - name: Store screenshots of test failures

diff --git a/.github/workflows/delete-release.yml b/.github/workflows/delete-release.yml
@@ -9,12 +9,12 @@ jobs:
   delete:
     name: On Delete Release
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+    if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
     steps:
 
       - name: Clear cache for release API
         run: |
           curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID }}/purge_cache" \
                -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \
                -H "Content-Type: application/json" \
-               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/bluehost/bluehost-wordpress-plugin"]}'
+               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-bluehost"]}'
diff --git a/.github/workflows/satis-webhook.yml b/.github/workflows/satis-webhook.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v3
         with:
-          token: ${{ secrets.SATIS_WEBHOOK_TOKEN }}
+          token: ${{ secrets.WEBHOOK_TOKEN }}
           repository: bluehost/satis
           event-type: 'Trigger Satis Build'
           client-payload: >-

diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml
@@ -22,14 +22,14 @@ jobs:
   build:
     name: On Push
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+    if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
     steps:
 
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Validate version number
-        if: ${{ (github.repository == 'bluehost/bluehost-wordpress-plugin') }}
+        if: ${{ (github.repository == 'newfold-labs/wp-plugin-bluehost') }}
         run: |
           pluginHeaderVersion=`grep "Version:" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
           pluginConstantVersion=`grep "'BLUEHOST_PLUGIN_VERSION'" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
@@ -55,7 +55,7 @@ jobs:
         run: |
           mkdir dist
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
-          echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
+          echo "PACKAGE=bluehost-wordpress-plugin" >> $GITHUB_OUTPUT
 
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
@@ -83,7 +83,7 @@ jobs:
           npm --version
 
       - name: Validate composer.json and composer.lock
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
         run: composer validate
 
       - name: Install PHP Dependencies

diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate version number
-        if: ${{ (github.repository == 'bluehost/bluehost-wordpress-plugin') && (github.event.release.prerelease == false) }}
+        if: ${{ (github.repository == 'newfold-labs/wp-plugin-bluehost') && (github.event.release.prerelease == false) }}
         run: |
           taggedVersion=${{ env.VERSION }}
           pluginHeaderVersion=`grep "Version:" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
@@ -51,7 +51,7 @@ jobs:
         run: |
           mkdir dist
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
-          echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
+          echo "PACKAGE=bluehost-wordpress-plugin" >> $GITHUB_OUTPUT
 
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
@@ -91,7 +91,7 @@ jobs:
         run: npm install --legacy-peer-deps
 
       - name: Validate WP Versions
-        if: ${{ (github.repository == 'bluehost/bluehost-wordpress-plugin') && (github.event.release.prerelease == false) }}
+        if: ${{ (github.repository == 'newfold-labs/wp-plugin-bluehost') && (github.event.release.prerelease == false) }}
         run: |
           pluginHeaderTestedVersion=`grep "Tested up to:" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
           wpEnvVersion=`grep "WordPress/WordPress#tags/" .wp-env.json | grep -Eo "[0-9\.]*"`
@@ -120,10 +120,10 @@ jobs:
           gh release upload "${{ github.event.release.tag_name }}" ${{ steps.workflow.outputs.DIST }}/${{ steps.workflow.outputs.PACKAGE }}.zip
 
       - name: Clear cache for release API
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
+        if: ${{ github.repository == 'newfold-labs/wp-plugin-bluehost' }}
         run: |
           curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID }}/purge_cache" \
                -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \
                -H "Content-Type: application/json" \
-               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/bluehost/bluehost-wordpress-plugin"]}'
+               --data '{"files":["https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-bluehost"]}'
 
diff --git 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.15.8
+ * Version:           4.0.0
  * Requires at least: 6.5
  * Requires PHP:      7.3
  * Tested up to:      6.7.1
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.15.8' );
+define( 'BLUEHOST_PLUGIN_VERSION', '4.0.0' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

diff --git a/bootstrap.php b/bootstrap.php
@@ -137,7 +137,7 @@ function () {
 setContainer( $bluehost_module_container );
 
 // Set up the updater endpoint and map values
-$updateurl     = 'https://hiive.cloud/workers/release-api/plugins/bluehost/bluehost-wordpress-plugin'; // Custom API GET endpoint
+$updateurl     = 'https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-bluehost?slug=bluehost-wordpress-plugin&file=bluehost-wordpress-plugin.php '; // Custom API GET endpoint
 $pluginUpdater = new PluginUpdater( BLUEHOST_PLUGIN_FILE, $updateurl );
 $pluginUpdater->setDataMap(
 	array(

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "bluehost/bluehost-wordpress-plugin",
+  "name": "newfold-labs/wp-plugin-bluehost",
   "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
   "type": "wordpress-plugin",
   "license": [
@@ -26,6 +26,9 @@
       "*": "dist"
     }
   },
+  "extra": {
+      "installer-name": "bluehost-wordpress-plugin"
+  },
   "repositories": {
     "newfold": {
       "type": "composer",
@@ -45,7 +48,7 @@
   "scripts": {
     "fix": "vendor/bin/phpcbf --standard=phpcs.xml .",
     "lint": "vendor/bin/phpcs --standard=phpcs.xml -s .",
-    "i18n-pot": "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-bluehost.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/bluehost/bluehost-wordpress-plugin/issues\",\"POT-Creation-Date\":\"2023-03-08T20:13:41+00:00\"}' --exclude=assets,tests,src",
+    "i18n-pot": "vendor/bin/wp i18n make-pot . ./languages/wp-plugin-bluehost.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/newfold-labs/wp-plugin-bluehost/issues\",\"POT-Creation-Date\":\"2023-03-08T20:13:41+00:00\"}' --exclude=assets,tests,src",
     "i18n-po": "vendor/bin/wp i18n update-po ./languages/wp-plugin-bluehost.pot ./languages",
     "i18n-mo": "vendor/bin/wp i18n make-mo ./languages",
     "i18n-json": "rm -f languages/*.json && vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
@@ -74,10 +77,10 @@
   "require": {
     "newfold-labs/wp-module-activation": "^1.0.5",
     "newfold-labs/wp-module-atomic": "^1.3.0",
-    "newfold-labs/wp-module-coming-soon": "^1.3.2",
+    "newfold-labs/wp-module-coming-soon": "^1.3.3",
     "newfold-labs/wp-module-context": "^1.0.1",
     "newfold-labs/wp-module-data": "^2.6.8",
-    "newfold-labs/wp-module-deactivation": "^1.2.3",
+    "newfold-labs/wp-module-deactivation": "^1.3.0",
     "newfold-labs/wp-module-ecommerce": "^1.4.4",
     "newfold-labs/wp-module-facebook": "^1.0.9",
     "newfold-labs/wp-module-features": "^1.4.2",