diff --git a/.github/workflows/create-milestones.yml b/.github/workflows/create-milestones.yml index 4bfff7f2..b7f957d3 100644 --- a/.github/workflows/create-milestones.yml +++ b/.github/workflows/create-milestones.yml @@ -41,10 +41,11 @@ jobs: # Set the date format for the milestone title and due date DATE=$(date -u -d "$DUE_DATE" '+%B %-d, %Y') # Human-readable date + PR_DEADLINE=$(date -u -d "$DUE_DATE - 1 week" '+%B %-d, %Y') # Date 1 week before DATE_ISO8601=$(date -u -d "$DUE_DATE" '+%Y-%m-%dT23:59:59Z') # ISO8601 format # Prepare the description for the milestone - DESCRIPTION="The release is scheduled for $DATE, and PRs should be submitted and made mergeable by EOD $DATE. This means they should have tests passing and merge conflicts resolved. The description for the PR must include details of what is included in the PR and how to test it, and preferably new tests supporting the update.\n\nAny PRs submitted after the deadline will not be included in the release but go in the next release. This includes PRs with tests failing, no description, no screenshots/video demonstrating the update, sufficient Cypress tests, no link to associated JIRA ticket, etc. If no mergeable PRs are submitted for a release, there will be no release that week (unless there is a need for an out-of-cycle release)." + DESCRIPTION="The release is scheduled for $DATE. PRs must be submitted and made mergeable by EOD $PR_DEADLINE (one week before release). This means they should have tests passing and merge conflicts resolved. The description for the PR must include details of what is included in the PR and how to test it, and preferably new tests supporting the update.\n\nAny PRs submitted after the deadline will not be included in the release but go in the next release. This includes PRs with tests failing, no description, no screenshots/video demonstrating the update, sufficient Cypress tests, no link to associated JIRA ticket, etc. If no mergeable PRs are submitted for a release, there will be no release that week (unless there is a need for an out-of-cycle release)." # Debugging outputs echo "Debug: Human-readable Date: $DATE" diff --git a/cypress.config.js b/cypress.config.js index 0574ed47..682c5f84 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -71,7 +71,7 @@ module.exports = defineConfig( { // Test requires Jetpack, so exclude if not supported due to WP or PHP versions if ( ! supportsJetpack( config.env ) ) { config.excludeSpecPattern = config.excludeSpecPattern.concat( [ - 'vendor/newfold-labs/wp-module-solutions/tests/cypress/integration/wp-plugins-installation-check.cy.js', + 'vendor/newfold-labs/wp-module-solutions/tests/cypress/integration/wp-plugins-installation-jetpack.cy.js', ] ); } diff --git a/package-lock.json b/package-lock.json index eff8e709..01ddceb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,9 +14,9 @@ "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.12", "@newfold/ui-component-library": "^1.1.0", - "@reduxjs/toolkit": "^2.4.0", + "@reduxjs/toolkit": "^2.5.0", "@wordpress/compose": "^7.13.0", - "@wordpress/dom-ready": "^4.13.0", + "@wordpress/dom-ready": "^4.14.0", "@wordpress/element": "^6.13.0", "@wordpress/html-entities": "^4.13.0", "@wordpress/i18n": "^5.13.0", @@ -28,14 +28,14 @@ "react": "^18.2.0", "react-error-boundary": "^4.1.2", "react-router-dom": "^7.0.2", - "react-use": "^17.5.1", + "react-use": "^17.6.0", "semver": "^7.6.3" }, "devDependencies": { "@tailwindcss/forms": "^0.5.8", "@testing-library/cypress": "^10.0.2", "@wordpress/env": "^10.13.0", - "@wordpress/eslint-plugin": "^21.6.0", + "@wordpress/eslint-plugin": "^22.0.0", "@wordpress/scripts": "^30.6.0", "cypress": "^13.16.1", "cypress-axe": "^1.5.0", @@ -4174,9 +4174,10 @@ } }, "node_modules/@reduxjs/toolkit": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.4.0.tgz", - "integrity": "sha512-wJZEuSKj14tvNfxiIiJws0tQN77/rDqucBq528ApebMIRHyWpCanJVQRxQ8WWZC19iCDKxDsGlbAir3F1layxA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.0.tgz", + "integrity": "sha512-awNe2oTodsZ6LmRqmkFhtb/KH03hUhxOamEQy411m3Njj3BbFvoBovxo4Q1cBWnV1ErprVj9MlF0UPXkng0eyg==", + "license": "MIT", "dependencies": { "immer": "^10.0.3", "redux": "^5.0.1", @@ -4184,7 +4185,7 @@ "reselect": "^5.1.0" }, "peerDependencies": { - "react": "^16.9.0 || ^17.0.0 || ^18", + "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" }, "peerDependenciesMeta": { @@ -6493,9 +6494,10 @@ } }, "node_modules/@wordpress/dom-ready": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-4.13.0.tgz", - "integrity": "sha512-ajR4BeHaUERWC7M3JyEVrhtahWYaj/r78k1bUoP80HRzAhIFEGsicPc9+j/KaLHFJoHyPllMiRZfTgjwYJ7zqQ==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-4.14.0.tgz", + "integrity": "sha512-VeLZZJwKM+Y1d9KPXJ7IQFWwxrND8Xlu+XHpEesudn2kxYE/F5E1uGwS+8LjuprKW+ZEBzgmzZRraKG+KbGFWg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "7.25.7" }, @@ -6597,10 +6599,11 @@ } }, "node_modules/@wordpress/eslint-plugin": { - "version": "21.6.0", - "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-21.6.0.tgz", - "integrity": "sha512-jvPtrN7JaUc94Z/cMF4XrENfQPOHdEcmYSt97k5yKthPO4zfrb3OwxGlHwyTv0RqQ8MbqCsU8gNdbECUjFzBEA==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-22.0.0.tgz", + "integrity": "sha512-Hh1sO9UV0IYI7D+F6EQnhvs2HAv4H0iBVZikXZKcPmQudlwgV2OWdNprdSe8IoRmpMqmhQ+gkaj9Gwk6NReGHQ==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "@babel/eslint-parser": "7.25.7", "@typescript-eslint/eslint-plugin": "^6.4.1", @@ -6628,7 +6631,7 @@ "@babel/core": ">=7", "eslint": ">=8", "prettier": ">=3", - "typescript": ">=4" + "typescript": ">=5" }, "peerDependenciesMeta": { "prettier": { @@ -20226,10 +20229,9 @@ } }, "node_modules/react-use": { - "version": "17.5.1", - "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.1.tgz", - "integrity": "sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==", - "license": "Unlicense", + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.6.0.tgz", + "integrity": "sha512-OmedEScUMKFfzn1Ir8dBxiLLSOzhKe/dPZwVxcujweSj45aNM7BEGPb9BEVIgVEqEXx6f3/TsXzwIktNgUR02g==", "dependencies": { "@types/js-cookie": "^2.2.6", "@xobotyi/scrollbar-width": "^1.9.5", diff --git a/package.json b/package.json index 5faaca9a..bc0fdb8d 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.12", "@newfold/ui-component-library": "^1.1.0", - "@reduxjs/toolkit": "^2.4.0", + "@reduxjs/toolkit": "^2.5.0", "@wordpress/compose": "^7.13.0", - "@wordpress/dom-ready": "^4.13.0", + "@wordpress/dom-ready": "^4.14.0", "@wordpress/element": "^6.13.0", "@wordpress/html-entities": "^4.13.0", "@wordpress/i18n": "^5.13.0", @@ -51,14 +51,14 @@ "react": "^18.2.0", "react-error-boundary": "^4.1.2", "react-router-dom": "^7.0.2", - "react-use": "^17.5.1", + "react-use": "^17.6.0", "semver": "^7.6.3" }, "devDependencies": { "@tailwindcss/forms": "^0.5.8", "@testing-library/cypress": "^10.0.2", "@wordpress/env": "^10.13.0", - "@wordpress/eslint-plugin": "^21.6.0", + "@wordpress/eslint-plugin": "^22.0.0", "@wordpress/scripts": "^30.6.0", "cypress": "^13.16.1", "cypress-axe": "^1.5.0", diff --git a/src/app/pages/settings/index.js b/src/app/pages/settings/index.js index 8d0f24d8..f7d95ca7 100644 --- a/src/app/pages/settings/index.js +++ b/src/app/pages/settings/index.js @@ -18,6 +18,7 @@ const Settings = () => { 'This is where you can manage common settings for your website.', 'wp-plugin-bluehost' ) } + id={ 'settings-header' } className={ 'wppbh-app-settings-header' } /> @@ -35,6 +36,7 @@ const Settings = () => { @@ -42,6 +44,7 @@ const Settings = () => { { - + diff --git a/src/app/util/helpers.js b/src/app/util/helpers.js index 0af5e120..4d50e656 100644 --- a/src/app/util/helpers.js +++ b/src/app/util/helpers.js @@ -223,8 +223,8 @@ export const handleHelpLinksClick = () => { * @return {boolean} Whether or not this is a jarvis site. */ export const isJarvis = () => { - if ( NewfoldRuntime.hasCapability( 'isJarvis' ) ) { - return window.NewfoldRuntime.capabilities.isJarvis; + if ( window.NewfoldRuntime.capabilities.hasOwnProperty( 'isJarvis' ) ) { + return NewfoldRuntime.hasCapability( 'isJarvis' ); } return true; };