Skip to content

Commit

Permalink
Merge branch 'main' into update/repo-org
Browse files Browse the repository at this point in the history
* main:
  Update description to mention PR due date is a week before
  run npm audit fix
  npm run set-version-bump - Version updated 3.15.7 => 3.15.8
  update solutions module and solutions test exclusion
  Add IDs to settings sections
  NPM(deps): Bump @reduxjs/toolkit from 2.4.0 to 2.5.0
  Composer(deps): Bump newfold-labs/wp-module-patterns from 2.8.0 to 2.8.1
  NPM Dev(deps-dev): Bump @wordpress/eslint-plugin from 21.6.0 to 22.0.0
  NPM(deps): Bump @wordpress/dom-ready from 4.13.0 to 4.14.0
  NPM(deps): Bump react-use from 17.5.1 to 17.6.0
  Fix 'isJarvis' check that always returned true
  Composer(deps): Bump newfold-labs/wp-module-data from 2.6.7 to 2.6.8

# Conflicts:
#	bluehost-wordpress-plugin.php
#	composer.json
#	composer.lock
#	languages/wp-plugin-bluehost.pot
#	package-lock.json
#	package.json
  • Loading branch information
circlecube committed Dec 18, 2024
2 parents 8988965 + 6cf3ecb commit 9a15ac3
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 28 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/create-milestones.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
] );
}

Expand Down
40 changes: 21 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion src/app/pages/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
/>

Expand All @@ -35,13 +36,15 @@ const Settings = () => {

<Container.Block
separator={ true }
id={ 'social-media-accounts-section' }
className={ 'wppbh-app-settings-social' }
>
<SocialMediaAccounts />
</Container.Block>

<Container.Block
separator={ true }
id={ 'wonder-blocks-section' }
className={ 'wppbh-app-settings-wonder-blocks' }
>
<Container.SettingsField
Expand All @@ -66,12 +69,16 @@ const Settings = () => {

<Container.Block
separator={ true }
id={ 'content-section' }
className={ 'wppbh-app-settings-content' }
>
<ContentSettings />
</Container.Block>

<Container.Block className={ 'wppbh-app-settings-comments' }>
<Container.Block
id={ 'comments-section' }
className={ 'wppbh-app-settings-comments' }
>
<CommentSettings />
</Container.Block>
</Container>
Expand Down
4 changes: 2 additions & 2 deletions src/app/util/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

0 comments on commit 9a15ac3

Please sign in to comment.