Merge pull request #290 from newfold-labs/feature/migration

Migration Prep/Release 3.2.0

.github/workflows/cypress-matrix.yml

@@ -28,10 +28,14 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
         wpVersion:
-          - '6.3'
           - '6.4'
           - '6.5'
+          - '6.6'
+        exclude:
+          - phpVersion: '7.1'
+            wpVersion: '6.6'
 
     steps:
 

.gitignore

@@ -16,7 +16,7 @@ cypress.env.json
 # Built-app files
 /.docs
 /build/*
-/wp-plugin-mojo
+/mojo-marketplace-wp-plugin
 
 # File Types
 *.log

bootstrap.php

@@ -102,7 +102,7 @@ function () {
 setContainer( $mojo_module_container );
 
 // Set up the updater endpoint and map values
-$mojo_update_url     = 'https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-mojo'; // Custom API GET endpoint
+$mojo_update_url     = 'https://hiive.cloud/workers/release-api/plugins/newfold-labs/wp-plugin-mojo?slug=mojo-marketplace-wp-plugin&file=mojo-marketplace.php '; // Custom API GET endpoint
 $mojo_plugin_updater = new PluginUpdater( MOJO_PLUGIN_FILE, $mojo_update_url );
 $mojo_plugin_updater->setDataMap(
 	array(

cypress.config.js

@@ -11,7 +11,7 @@ module.exports = defineConfig({
     phpVersion,
     pluginId: 'mojo',
     appId: 'wppm',
-    pluginSlug: 'wp-plugin-mojo',
+    pluginSlug: 'mojo',
   },
   downloadsFolder: 'tests/cypress/downloads',
   fixturesFolder: 'tests/cypress/fixtures',
@@ -76,7 +76,8 @@ module.exports = defineConfig({
     supportFile: 'tests/cypress/support/index.js',
     testIsolation: false,
     excludeSpecPattern: [
-        'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon.cy.js' // excluding until either adding ecommerce module or removing coming soon components in ecommerce module
+        'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon.cy.js', // excluding until either adding ecommerce module or removing coming soon components in ecommerce module
+        'vendor/newfold-labs/wp-module-deactivation/tests/cypress/integration/deactivation-survey.cy.js' // excluding due to the mismatched slug name
     ],
     experimentalRunAllSpecs: true,
   },

inc/Admin.php

@@ -23,11 +23,12 @@ public function __construct() {
 		/* Load Page Scripts & Styles. */
 		\add_action( 'load-toplevel_page_mojo', array( __CLASS__, 'assets' ) );
 		/* Add Links to WordPress Plugins list item. */
-		\add_filter( 'plugin_action_links_wp-plugin-mojo/wp-plugin-mojo.php', array( __CLASS__, 'actions' ) );
+		\add_filter( 'plugin_action_links_mojo-marketplace-wp-plugin/mojo-marketplace.php', array( __CLASS__, 'actions' ) ); // for build
+		\add_filter( 'plugin_action_links_wp-plugin-mojo/mojo-marketplace.php', array( __CLASS__, 'actions' ) ); // for local dev
 		/* Add inline style to hide subnav link */
 		\add_action( 'admin_head', array( __CLASS__, 'admin_nav_style' ) );
 		/* Add runtime for data store */
-		\add_filter('newfold_runtime', array( __CLASS__, 'add_to_runtime' ) );
+		\add_filter( 'newfold_runtime', array( __CLASS__, 'add_to_runtime' ) );
 
 		if ( isset( $_GET['page'] ) && strpos( filter_input( INPUT_GET, 'page', FILTER_UNSAFE_RAW ), 'mojo' ) >= 0 ) { // phpcs:ignore
 			\add_action( 'admin_footer_text', array( __CLASS__, 'add_brand_to_admin_footer' ) );
@@ -71,7 +72,7 @@ public static function subpages() {
 		$help        = array(
 			'mojo#/help' => __( 'Help', 'wp-plugin-mojo' ),
 		);
-		
+
 		return array_merge(
 			$home,
 			$marketplace,