Skip to content

Commit

Permalink
Merge pull request #839 from bluehost/release/3.7.0
Browse files Browse the repository at this point in the history
Release/3.7.0
  • Loading branch information
circlecube authored Dec 6, 2023
2 parents 4bd08ad + f1ae376 commit d1b9f9b
Show file tree
Hide file tree
Showing 72 changed files with 3,026 additions and 3,188 deletions.
31 changes: 31 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module.exports = {
extends: [ 'plugin:@wordpress/eslint-plugin/recommended' ],
settings: {
'import/resolver': {
alias: {
map: [
[ 'App', './src/app' ],
[ 'Assets', './aseets' ],
[ '@modules', './vendor/newfold-labs' ],
],
extensions: [ '.js', '.jsx', '.json' ],
},
},
},
globals: {
__: true,
_camelCase: true,
_filter: true,
_n: true,
classNames: true,
useContext: true,
useEffect: true,
useState: true,
},
rules: {
'import/no-unresolved': [
'error',
{ ignore: [ '^App/', '^Assets/' ] },
],
},
};
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: 2
registries: "*"
updates:

# Maintain dependencies for GitHub Actions
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/cypress-tests-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,9 @@ jobs:
run: npx wp-env start --debug

- name: Run Cypress Tests
if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
run: npm run test:e2e -- --browser chrome

- name: Run Cypress Tests
if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag "bluehost, wp-beta"

- name: Store screenshots of test failures
if: failure()
uses: actions/upload-artifact@v3
Expand Down
91 changes: 91 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: ESLint

on:
push:
branches:
- main
- master
- trunk
- develop
- release/*
- feature/*
- add/*
- update/*
- fix/*
- try/*'
paths:
- 'src/**/*.js'
pull_request:
types: [ opened, edited, reopened, ready_for_review ]
paths:
- 'src/**/*.js'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

jobs:
ESLint:
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
coverage: none
tools: composer, cs2pr

- name: Setup workflow context
id: workflow
working-directory: ${{ runner.temp }}
env:
REPO: ${{ github.repository }}
run: |
mkdir dist
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
uses: actions/setup-node@v4
with:
node-version: 16.x
cache: 'npm'

- name: Get Composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer vendor directory
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Show versions
run: |
php --version
composer --version
node --version
npm --version
- name: Validate composer.json and composer.lock
run: composer validate

- name: Install PHP Dependencies
run: composer install --no-progress --no-dev --optimize-autoloader --prefer-dist

- name: Setup Registry
run: printf "\n//npm.pkg.github.com/:_authToken=${{ secrets.NEWFOLD_ACCESS_TOKEN }}" >> .npmrc

- name: NPM Install
run: npm ci --legacy-peer-deps

- name: ESLint
run: npm run lint:js
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "WordPress/WordPress#tags/6.3.2",
"core": "WordPress/WordPress#tags/6.4.2",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
6 changes: 3 additions & 3 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
* 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.6.0
* Version: 3.7.0
* Requires at least: 6.0
* Requires PHP: 7.1
* Tested up to: 6.4.0
* Tested up to: 6.4.2
* Author: Bluehost
* Author URI: https://bluehost.com
* Text Domain: wp-plugin-bluehost
Expand All @@ -32,7 +32,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.6.0' );
define( 'BLUEHOST_PLUGIN_VERSION', '3.7.0' );
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,28 @@
"roave/security-advisories": "dev-latest",
"newfold-labs/wp-php-standards": "^1.2",
"wp-cli/i18n-command": "^2.4.4",
"wp-phpunit/wp-phpunit": "^6.3.1"
"wp-phpunit/wp-phpunit": "^6.4.1"
},
"require": {
"newfold-labs/wp-module-business-reviews": "^1.1.1",
"newfold-labs/wp-module-coming-soon": "^1.1.12",
"newfold-labs/wp-module-ctb": "^1.1.2",
"newfold-labs/wp-module-customer-bluehost": "^1.6.0",
"newfold-labs/wp-module-data": "^2.4.9",
"newfold-labs/wp-module-deactivation": "^1.0.2",
"newfold-labs/wp-module-ecommerce": "^1.3.9",
"newfold-labs/wp-module-data": "^2.4.14",
"newfold-labs/wp-module-deactivation": "^1.0.3",
"newfold-labs/wp-module-ecommerce": "^1.3.14",
"newfold-labs/wp-module-global-ctb": "^1.0.9",
"newfold-labs/wp-module-help-center": "1.0.21",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.1.0",
"newfold-labs/wp-module-notifications": "^1.1.6",
"newfold-labs/wp-module-onboarding": "^1.11.8",
"newfold-labs/wp-module-patterns": "^0.1.8",
"newfold-labs/wp-module-performance": "^1.2.2",
"newfold-labs/wp-module-marketplace": "^2.2.0",
"newfold-labs/wp-module-notifications": "^1.2.1",
"newfold-labs/wp-module-onboarding": "^1.11.10",
"newfold-labs/wp-module-patterns": "^0.1.11",
"newfold-labs/wp-module-performance": "^1.3.0",
"newfold-labs/wp-module-runtime": "^1.0.7",
"newfold-labs/wp-module-secure-passwords": "^1.1",
"newfold-labs/wp-module-sso": "^1.0.4",
"newfold-labs/wp-module-staging": "^1.1.1",
"newfold-labs/wp-module-staging": "^1.2.3",
"wp-forge/wp-update-handler": "^1.0",
"wp-forge/wp-upgrade-handler": "^1.0"
}
Expand Down
Loading

0 comments on commit d1b9f9b

Please sign in to comment.