fix admin menu

Author: kilbot

.github/workflows/wp-engine.yml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Build
         run: |
-          yarn install
+          YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
           composer install --no-dev
           yarn build:js
 

.github/workflows/wporg-deploy.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Build
         run: |
-          yarn install
+          YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
           composer install --no-dev
           yarn build:js
 

.gitignore

@@ -23,7 +23,7 @@ assets/css/*
 assets/asset-manifest.json
 assets/static
 assets/report.html
-.yarn.lock
+yarn.lock
 .yarn/install-state.gz
 .yarn/cache
 hookdocs

includes/Admin.php

@@ -38,10 +38,8 @@ private function init(): void {
 
 	/**
 	 * Fires before the administration menu loads in the admin.
-	 *
-	 * @param string $context Empty context.
 	 */
-	public function admin_menu( $context ): void {
+	public function admin_menu(): void {
 		$menu = new Admin\Menu();
 		$this->menu_ids = array(
 			'toplevel' => $menu->toplevel_screen_id,

includes/Init.php

@@ -28,7 +28,6 @@ public function __construct() {
 
 		// Init hooks
 		add_action( 'init', array( $this, 'init' ) );
-        add_action( 'admin_init', array( $this, 'admin_init' ) );
 		add_action( 'rest_api_init', array( $this, 'rest_api_init' ), 20 );
 		add_filter( 'query_vars', array( $this, 'query_vars' ) );
 
@@ -72,23 +71,23 @@ public function init(): void {
 			new Form_Handler();
 		}
 
+        /**
+         * NOTE: admin_menu runs before admin_init, so we need to load the Admin class here
+         */
+        if ( is_admin() ) {
+            if ( defined( '\DOING_AJAX' ) && DOING_AJAX ) {
+                // AJAX requests
+                new AJAX();
+            } else {
+                // Non-AJAX (Admin) requests
+                new Admin();
+            }
+        }
+
 		// load integrations
 		$this->integrations();
 	}
 
-    /**
-     *
-     */
-    public function admin_init(): void {
-        if ( defined( '\DOING_AJAX' ) && DOING_AJAX ) {
-            // AJAX requests
-            new AJAX();
-        } else {
-            // Non-AJAX (Admin) requests
-            new Admin();
-        }
-    }
-
 	/**
 	 * Loads the POS API and duck punches the WC REST API.
 	 */