Merge branch 'develop' into update/ecommerce-version-bump-1.3.40

newfold-labs · Aug 14, 2024 · 3770682 · 3770682
2 parents 11925ae + b43f326
commit 3770682
Show file tree

Hide file tree

Showing 11 changed files with 698 additions and 693 deletions.
diff --git a/composer.json b/composer.json
@@ -86,7 +86,7 @@
         "newfold-labs/wp-module-marketplace": "^2.4.0",
         "newfold-labs/wp-module-migration": "^1.0.9",
         "newfold-labs/wp-module-notifications": "^1.5.0",
-        "newfold-labs/wp-module-onboarding": "^2.3.10",
+        "newfold-labs/wp-module-onboarding": "^2.3.11",
         "newfold-labs/wp-module-patterns": "^2.3.1",
         "newfold-labs/wp-module-performance": "2.0.0 as 1.9.9",
         "newfold-labs/wp-module-runtime": "^1.0.11",

diff --git a/composer.lock b/composer.lock
diff --git a/cypress.config.js b/cypress.config.js
@@ -60,7 +60,9 @@ module.exports = defineConfig({
 			if ( semver.satisfies( config.env.wpSemverVersion, '<6.5.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
 				config.excludeSpecPattern = config.excludeSpecPattern.concat( [
 					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
-					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js'
+					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
+					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Skip this since Onboarding does not support this version
+					'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/**' // Onboarding requires WP 6.5 or greater, as it uses the Wonder Theme which has the same requirement
 				] );
 			}
 

diff --git a/..._MX-1ef12f46dc722a8282161785ff9c7ebb.json → ..._MX-3442a8153a37b4f6a4b45bfaa51c2b1c.json b/..._MX-1ef12f46dc722a8282161785ff9c7ebb.json → ..._MX-3442a8153a37b4f6a4b45bfaa51c2b1c.json
@@ -1,7 +1,7 @@
 {
     "translation-revision-date": "2023-08-24 18:27",
     "generator": "WP-CLI\/2.10.0",
-    "source": "build\/2.11.1\/index.js",
+    "source": "build\/2.11.2\/index.js",
     "domain": "messages",
     "locale_data": {
         "messages": {