generator-chisel 2.0.0-alpha.8 → 2.0.0

package/lib/commands/create/creators/app/chisel-starter-theme/{classes → inc/WP}/Assets.php

@@ -1,89 +1,99 @@
 <?php
 
-namespace Chisel;
+namespace Chisel\WP;
+
+use Chisel\Interfaces\InstanceInterface;
+use Chisel\Interfaces\HooksInterface;
+use Chisel\Traits\Singleton;
+use Chisel\Helper\ThemeHelpers;
+use Chisel\Helper\AjaxHelpers;
+use Chisel\Helper\AssetsHelpers;
 
 /**
  * Class for enqueuing scripts and styles.
  *
  * @package Chisel
  */
-class Assets implements Instance {
+class Assets implements InstanceInterface, HooksInterface {
+
+	use Singleton;
 
 	/**
 	 * Front-end styles to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $frontend_styles = array();
+	private $frontend_styles = array();
 
 	/**
 	 * Front-end styles to be registered and enqueued in footer.
 	 *
 	 * @var array
 	 */
-	protected $frontend_footer_styles = array();
+	private $frontend_footer_styles = array();
 
 	/**
 	 * Front-end scripts to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $frontend_scripts = array();
+	private $frontend_scripts = array();
 
 	/**
 	 * Admin styles to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $admin_styles = array();
+	private $admin_styles = array();
 
 	/**
 	 * Admin scripts to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $admin_scripts = array();
+	private $admin_scripts = array();
 
 	/**
 	 * Editor styles to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $editor_styles = array();
+	private $editor_styles = array();
 
 	/**
 	 * Editor scripts to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $editor_scripts = array();
+	private $editor_scripts = array();
 
 	/**
 	 * Login page styles to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $login_styles = array();
+	private $login_styles = array();
 
 	/**
 	 * Login page scripts to be registered and enqueued.
 	 *
 	 * @var array
 	 */
-	protected $login_scripts = array();
+	private $login_scripts = array();
 
 	/**
 	 * WP React Refresh runtime dependency.
 	 *
 	 * @var string
 	 */
-	protected $refresh_runtime_dependency = 'wp-react-refresh-runtime';
+	private $refresh_runtime_dependency = 'wp-react-refresh-runtime';
 
 	/**
 	 * Class constructor.
 	 */
 	private function __construct() {
-		$this->set_properties();
+		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
+
 		$this->action_hooks();
 		$this->filter_hooks();
 	}
@@ -98,7 +108,7 @@ class Assets implements Instance {
 			'deps'      => array( $this->refresh_runtime_dependency ),
 			'strategy'  => false,
 			'condition' => function () {
-				return self::is_fast_refresh();
+				return ThemeHelpers::is_fast_refresh();
 			},
 		);
 
@@ -115,7 +125,7 @@ class Assets implements Instance {
 						'name' => 'chiselScripts',
 						'data' => array(
 							'ajax' => array(
-								'url'   => esc_url( Ajax::get_ajax_endpoint_url() ),
+								'url'   => esc_url( AjaxHelpers::get_ajax_endpoint_url() ),
 								'nonce' => wp_create_nonce( 'wp_rest' ), // this (wp_rest) authenticates users and allows using get_current_user functions in rest api endpoints.
 							),
 						),
@@ -134,7 +144,7 @@ class Assets implements Instance {
 						'localize' => array(
 							'name' => 'chiselScripts',
 							'data' => array(
-								'logoData' => Helpers::get_login_page_logo_data(),
+								'logoData' => ThemeHelpers::get_login_page_logo_data(),
 							),
 						),
 					),
@@ -151,7 +161,7 @@ class Assets implements Instance {
 					'localize' => array(
 						'name' => 'chiselAdminScripts',
 						'data' => array(
-							'acfColorPickerPalette' => Helpers::get_colors_palette( 'acf' ),
+							'acfColorPickerPalette' => ThemeHelpers::get_colors_palette( 'acf' ),
 						),
 					),
 				),
@@ -167,8 +177,10 @@ class Assets implements Instance {
 						'name' => 'chiselEditorScripts',
 						'data' => array(
 							'icons' => array(
-								'minus' => __( 'Minus', 'chisel' ),
-								'plus'  => __( 'Plus', 'chisel' ),
+								'arrow-left'  => __( 'Arrow Left', 'chisel' ),
+								'arrow-right' => __( 'Arrow Right', 'chisel' ),
+								'minus'       => __( 'Minus', 'chisel' ),
+								'plus'        => __( 'Plus', 'chisel' ),
 							),
 						),
 					),
@@ -182,6 +194,7 @@ class Assets implements Instance {
 	 */
 	public function action_hooks() {
 		add_action( 'init', array( $this, 'register_assets' ) );
+		add_action( 'init', array( $this, 'move_scripts_to_footer' ), 2 );
 
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_assets' ), 99 ); // Higher priority, overwrite plugins if needed.
 		add_action( 'wp_footer', array( $this, 'enqueue_frontend_assets_in_footer' ), 11 ); // Higher priority, overwrite plugins if needed.
@@ -197,6 +210,25 @@ class Assets implements Instance {
 	 * Register filter hooks.
 	 */
 	public function filter_hooks() {
+		add_filter( 'script_loader_tag', array( $this, 'async_script' ), 99, 2 );
+		add_filter( 'script_loader_tag', array( $this, 'defer_script' ), 99, 2 );
+		add_filter( 'style_loader_tag', array( $this, 'preload_styles' ), 99, 2 );
+	}
+
+	/**
+	 * Move all scripts to footer
+	 *
+	 * @return void
+	 */
+	public function move_scripts_to_footer() {
+		if ( ! is_admin() ) {
+			remove_action( 'wp_head', 'wp_print_scripts' );
+			remove_action( 'wp_head', 'wp_print_head_scripts', 9 );
+			remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
+
+			add_action( 'wp_footer', 'wp_print_scripts', 5 );
+			add_action( 'wp_footer', 'wp_print_head_scripts', 5 );
+		}
 	}
 
 	/**
@@ -212,19 +244,19 @@ class Assets implements Instance {
 
 			if ( $this->frontend_styles ) {
 				foreach ( $this->frontend_styles as $file_name => $args ) {
-					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_style( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
 			if ( $this->frontend_footer_styles ) {
 				foreach ( $this->frontend_footer_styles as $file_name => $args ) {
-					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_style( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
 			if ( $this->frontend_scripts ) {
 				foreach ( $this->frontend_scripts as $file_name => $args ) {
-					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_script( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
@@ -233,7 +265,7 @@ class Assets implements Instance {
 					$login_styles_data = array();
 
 					foreach ( $this->login_styles as $file_name => $args ) {
-						$login_styles_data = $this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+						$login_styles_data = $this->register_style( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 					}
 
 					if ( isset( $login_styles_data['ver'] ) ) {
@@ -243,7 +275,7 @@ class Assets implements Instance {
 
 				if ( $this->login_scripts ) {
 					foreach ( $this->login_scripts as $file_name => $args ) {
-						$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+						$this->register_script( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 					}
 				}
 			}
@@ -255,25 +287,25 @@ class Assets implements Instance {
 
 			if ( $this->admin_styles ) {
 				foreach ( $this->admin_styles as $file_name => $args ) {
-					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_style( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
 			if ( $this->admin_scripts ) {
 				foreach ( $this->admin_scripts as $file_name => $args ) {
-					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_script( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
 			if ( $this->editor_styles ) {
 				foreach ( $this->editor_styles as $file_name => $args ) {
-					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_style( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 
 			if ( $this->editor_scripts ) {
 				foreach ( $this->editor_scripts as $file_name => $args ) {
-					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+					$this->register_script( AssetsHelpers::get_final_handle( $file_name ), $file_name, $args );
 				}
 			}
 		}
@@ -289,10 +321,10 @@ class Assets implements Instance {
 		if ( $this->frontend_styles ) {
 			foreach ( $this->frontend_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_style', true, $handle, $args );
-				$style_handle  = self::get_final_handle( $handle );
+				$style_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
-					wp_enqueue_style( $style_handle );
+					$this->enqueue_style( $style_handle, $args );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -303,11 +335,10 @@ class Assets implements Instance {
 		if ( $this->frontend_scripts ) {
 			foreach ( $this->frontend_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_frontend_script', true, $handle, $args );
-				$script_handle  = self::get_final_handle( $handle );
+				$script_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
-					wp_enqueue_script( $script_handle );
-					$this->set_script_translations( $handle, $args );
+					$this->enqueue_script( $script_handle, $args );
 				}
 			}
 		}
@@ -322,10 +353,10 @@ class Assets implements Instance {
 		if ( $this->frontend_footer_styles ) {
 			foreach ( $this->frontend_footer_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_footer_style', true, $handle, $args );
-				$style_handle  = self::get_final_handle( $handle );
+				$style_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
-					wp_enqueue_style( $style_handle );
+					$this->enqueue_style( $style_handle, $args );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -344,10 +375,10 @@ class Assets implements Instance {
 		if ( $this->admin_styles ) {
 			foreach ( $this->admin_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_admin_style', true, $handle, $args );
-				$style_handle  = self::get_final_handle( $handle );
+				$style_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
-					wp_enqueue_style( $style_handle );
+					$this->enqueue_style( $style_handle, $args );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -358,11 +389,10 @@ class Assets implements Instance {
 		if ( $this->admin_scripts ) {
 			foreach ( $this->admin_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_admin_script', true, $handle, $args );
-				$script_handle  = self::get_final_handle( $handle );
+				$script_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
-					wp_enqueue_script( $script_handle );
-					$this->set_script_translations( $handle, $args );
+					$this->enqueue_script( $script_handle, $args );
 				}
 			}
 		}
@@ -378,10 +408,10 @@ class Assets implements Instance {
 		if ( $this->editor_styles ) {
 			foreach ( $this->editor_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_editor_style', true, $handle, $args );
-				$style_handle  = self::get_final_handle( $handle );
+				$style_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
-					wp_enqueue_style( $style_handle );
+					$this->enqueue_style( $style_handle, $args );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -392,11 +422,10 @@ class Assets implements Instance {
 		if ( $this->editor_scripts ) {
 			foreach ( $this->editor_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_editor_script', true, $handle, $args );
-				$script_handle  = self::get_final_handle( $handle );
+				$script_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
-					wp_enqueue_script( $script_handle );
-					$this->set_script_translations( $handle, $args );
+					$this->enqueue_script( $script_handle, $args );
 				}
 			}
 		}
@@ -421,10 +450,10 @@ class Assets implements Instance {
 		if ( $this->login_styles ) {
 			foreach ( $this->login_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_login_style', true, $handle, $args );
-				$style_handle  = self::get_final_handle( $handle );
+				$style_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
-					wp_enqueue_style( $style_handle );
+					$this->enqueue_style( $style_handle, $args );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -435,14 +464,127 @@ class Assets implements Instance {
 		if ( $this->login_scripts ) {
 			foreach ( $this->login_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_login_script', true, $handle, $args );
-				$script_handle  = self::get_final_handle( $handle );
+				$script_handle  = AssetsHelpers::get_final_handle( $handle );
 
 				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
-					wp_enqueue_script( $script_handle );
-					$this->set_script_translations( $handle, $args );
+					$this->enqueue_script( $script_handle, $args );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Async scripts by handle.
+	 *
+	 * @param string $tag
+	 * @param string $handle
+	 *
+	 * @return string
+	 */
+	public function async_script( $tag, $handle ) {
+		if ( is_admin() ) {
+			return $tag;
+		}
+
+		$scripts = array();
+
+		if ( $scripts ) {
+			foreach ( $scripts as $script_handle ) {
+				if ( $handle === $script_handle ) {
+					$tag = str_replace( ' src', ' async src', $tag );
+				}
+			}
+		}
+
+		return $tag;
+	}
+
+	/**
+	 * Defer scripts by handle.
+	 *
+	 * @param string $tag
+	 * @param string $handle
+	 *
+	 * @return string
+	 */
+	public function defer_script( $tag, $handle ) {
+		if ( is_admin() ) {
+			return $tag;
+		}
+
+		$scripts = array();
+
+		// Defer all wp scripts.
+		if ( strpos( $handle, 'wp' ) === false ) {
+			if ( strpos( $handle, 'defer' ) === false ) {
+				$tag = str_replace( ' src', ' defer src', $tag );
+			}
+		}
+
+		if ( $scripts ) {
+			foreach ( $scripts as $script_handle ) {
+				if ( $handle === $script_handle ) {
+					$tag = str_replace( ' src', ' defer src', $tag );
+				}
+			}
+		}
+
+		return $tag;
+	}
+
+	/**
+	 * Preload styles by handle.
+	 *
+	 * @param string $tag
+	 * @param string $handle
+	 *
+	 * @return string
+	 */
+	public function preload_styles( $tag, $handle ) {
+		if ( is_admin() ) {
+			return $tag;
+		}
+
+		$styles_handles = array(
+			'wp-block-library',
+		);
+
+		$styles_handles_start_with = array(
+			'gform_',
+			'block',
+		);
+
+		if ( $styles_handles ) {
+			foreach ( $styles_handles as $style_handle ) {
+				if ( $handle === $style_handle ) {
+					$tag = $this->preload_style( $tag );
+				}
+			}
+		}
+
+		if ( $styles_handles_start_with ) {
+			foreach ( $styles_handles_start_with as $style_handle ) {
+				if ( strpos( $handle, $style_handle ) === 0 ) {
+					$tag = $this->preload_style( $tag );
 				}
 			}
 		}
+
+		return $tag;
+	}
+
+	/**
+	 * Preload style tag.
+	 *
+	 * @param string $tag
+	 *
+	 * @return string
+	 */
+	private function preload_style( $tag ) {
+		$preload_tag = str_replace( "rel='stylesheet'", "rel='preload' as='style'", $tag );
+		$tag         = $preload_tag . str_replace( "media='all'", "media='print' onload='this.media=\"all\"'", $tag );
+
+		return $tag;
 	}
 
 	/**
@@ -454,14 +596,13 @@ class Assets implements Instance {
 	 *
 	 * @return void
 	 */
-	protected function register_style( $handle, $file_name, $args ) {
+	private function register_style( $handle, $file_name, $args ) {
 		$asset_data = $this->get_asset( $file_name, 'css' );
 
 		$src       = isset( $args['src'] ) ? $args['src'] : $this->get_style_src( $file_name );
 		$deps      = isset( $args['deps'] ) ? $args['deps'] : array();
 		$ver       = isset( $args['ver'] ) ? $args['ver'] : $asset_data['version'];
 		$media     = isset( $args['media'] ) ? $args['media'] : 'all';
-		$inline    = isset( $args['inline'] ) ? $args['inline'] : '';
 		$condition = isset( $args['condition'] ) ? $args['condition'] : null;
 
 		// Use condition to determine if the style should be registered. It can be either a boolean or a function.
@@ -481,12 +622,8 @@ class Assets implements Instance {
 
 		wp_register_style( $handle, $src, $deps, $ver, $media );
 
-		if ( $inline ) {
-			wp_add_inline_style( $handle, $inline['data'] );
-		}
-
 		// Register js file for fast refresh of the css file.
-		if ( self::is_fast_refresh() ) {
+		if ( ThemeHelpers::is_fast_refresh() ) {
 			$this->register_script(
 				'style-' . $handle,
 				$file_name,
@@ -506,6 +643,28 @@ class Assets implements Instance {
 		);
 	}
 
+	/**
+	 * Enqueue script wrapper function.
+	 *
+	 * @param string $handle - full script handle.
+	 * @param array  $args
+	 *
+	 * @return array
+	 */
+	private function enqueue_style( $handle, $args ) {
+		$inline = isset( $args['inline'] ) ? $args['inline'] : '';
+
+		if ( $inline ) {
+			wp_add_inline_style( $handle, $inline['data'] );
+		}
+
+		wp_enqueue_style( $handle );
+
+		return array(
+			'handle' => $handle,
+		);
+	}
+
 	/**
 	 * Register script wrapper function.
 	 *
@@ -515,15 +674,16 @@ class Assets implements Instance {
 	 *
 	 * @return void
 	 */
-	protected function register_script( $handle, $file_name, $args ) {
+	private function register_script( $handle, $file_name, $args ) {
 		$asset_data = $this->get_asset( $file_name, 'js' );
 
 		$src       = isset( $args['src'] ) ? $args['src'] : $this->get_script_src( $file_name );
 		$deps      = isset( $args['deps'] ) ? $args['deps'] : array();
 		$ver       = isset( $args['ver'] ) ? $args['ver'] : $asset_data['version'];
-		$strategy  = isset( $args['strategy'] ) ? $args['strategy'] : true; // Strategy can be a boolean, which determines if the script should be enqueued in the footer, or an array with the following keys: 'in_footer':boolean and 'strategy':string (defer or async).
-		$localize  = isset( $args['localize'] ) ? $args['localize'] : array();
-		$inline    = isset( $args['inline'] ) ? $args['inline'] : '';
+		$strategy  = isset( $args['strategy'] ) ? $args['strategy'] : array(
+			'in_footer' => true,
+			'strategy'  => 'defer',
+		); // Strategy can be a boolean, which determines if the script should be enqueued in the footer, or an array with the following keys: 'in_footer':boolean and 'strategy':string (defer or async).
 		$condition = isset( $args['condition'] ) ? $args['condition'] : null;
 
 		// Use condition to determine if the script should be registered. It can be either a boolean or a function.
@@ -543,6 +703,28 @@ class Assets implements Instance {
 
 		wp_register_script( $handle, $src, $deps, $ver, $strategy );
 
+		return array(
+			'src'       => $src,
+			'deps'      => $deps,
+			'ver'       => $ver,
+			'strategy'  => $strategy,
+			'condition' => $condition,
+			'handle'    => $handle,
+		);
+	}
+
+	/**
+	 * Enqueue script wrapper function.
+	 *
+	 * @param string $handle - full script handle.
+	 * @param array  $args
+	 *
+	 * @return array
+	 */
+	private function enqueue_script( $handle, $args ) {
+		$localize = isset( $args['localize'] ) ? $args['localize'] : array();
+		$inline   = isset( $args['inline'] ) ? $args['inline'] : '';
+
 		if ( $localize ) {
 			wp_localize_script( $handle, $localize['name'], $localize['data'] );
 		}
@@ -551,14 +733,12 @@ class Assets implements Instance {
 			wp_add_inline_script( $handle, $inline['data'], $inline['position'] );
 		}
 
+		wp_enqueue_script( $handle );
+		$this->set_script_translations( $handle, $args );
+
 		return array(
-			'src'       => $src,
-			'deps'      => $deps,
-			'ver'       => $ver,
-			'strategy'  => $strategy,
-			'condition' => $condition,
-			'localize'  => $localize,
-			'handle'    => $handle,
+			'localize' => $localize,
+			'handle'   => $handle,
 		);
 	}
 
@@ -570,9 +750,9 @@ class Assets implements Instance {
 	 *
 	 * @return void
 	 */
-	protected function set_script_translations( $handle, $args ) {
+	private function set_script_translations( $handle, $args ) {
 		if ( isset( $args['deps'] ) && in_array( 'wp-i18n', $args['deps'], true ) ) {
-			wp_set_script_translations( self::get_final_handle( $handle ), 'chisel', get_template_directory() . '/languages' );
+			wp_set_script_translations( AssetsHelpers::get_final_handle( $handle ), 'chisel', get_template_directory() . '/languages' );
 		}
 	}
 
@@ -583,9 +763,9 @@ class Assets implements Instance {
 	 *
 	 * @return void
 	 */
-	protected function enqueue_style_js_for_dev( $handle ) {
-		if ( self::is_fast_refresh() ) {
-			wp_enqueue_script( 'style-' . self::get_final_handle( $handle ) );
+	private function enqueue_style_js_for_dev( $handle ) {
+		if ( ThemeHelpers::is_fast_refresh() ) {
+			wp_enqueue_script( 'style-' . AssetsHelpers::get_final_handle( $handle ) );
 		}
 	}
 
@@ -596,7 +776,7 @@ class Assets implements Instance {
 	 *
 	 * @return string
 	 */
-	protected function get_script_src( $file_name ) {
+	private function get_script_src( $file_name ) {
 		return get_template_directory_uri() . '/build/scripts/' . $file_name . '.js';
 	}
 
@@ -608,7 +788,7 @@ class Assets implements Instance {
 	 *
 	 * @return string
 	 */
-	protected function get_style_src( $file_name, $refresh_script = false ) {
+	private function get_style_src( $file_name, $refresh_script = false ) {
 		if ( $refresh_script ) {
 			return get_template_directory_uri() . '/build/styles/' . $file_name . '.js';
 		}
@@ -624,7 +804,7 @@ class Assets implements Instance {
 	 *
 	 * @return array
 	 */
-	protected function get_asset( $file_name, $type ) {
+	private function get_asset( $file_name, $type ) {
 		if ( $type === 'css' ) {
 			$asset_path = get_template_directory() . '/build/styles/' . $file_name . '.asset.php';
 		} else {
@@ -633,7 +813,7 @@ class Assets implements Instance {
 
 		$asset = array(
 			'dependencies' => array(),
-			'version'      => Helpers::get_theme_version(),
+			'version'      => ThemeHelpers::get_theme_version(),
 		);
 
 		if ( is_file( $asset_path ) ) {
@@ -642,7 +822,7 @@ class Assets implements Instance {
 			// We must remove that dependency for styles in fast refresh mode. For some reason styles are not loaded otherwise.
 			if (
 				$type === 'css' &&
-				self::is_fast_refresh() &&
+				ThemeHelpers::is_fast_refresh() &&
 				( $index = array_search( $this->refresh_runtime_dependency, $asset['dependencies'] ) ) !== false // phpcs:ignore
 			) {
 				unset( $asset['dependencies'][ $index ] );
@@ -651,45 +831,4 @@ class Assets implements Instance {
 
 		return $asset;
 	}
-
-	/**
-	 * Get the final handle for the asset.
-	 *
-	 * @param string $handle
-	 *
-	 * @return string
-	 */
-	protected function get_final_handle( $handle ) {
-		$handle = 'chisel-' . $handle;
-
-		if ( self::is_fast_refresh() ) {
-			$handle .= '-fast-refresh';
-		}
-
-		return $handle;
-	}
-
-	/**
-	 * Check if current environment is development and runnning in fast refresh mode. Set define( 'WP_ENVIRONMENT_TYPE', 'development' ); in wp-config-local.
-	 *
-	 * @return bool
-	 */
-	public static function is_fast_refresh() {
-		$runtime = get_template_directory() . '/build/runtime.js';
-
-		return Helpers::is_dev_env() && is_file( $runtime );
-	}
-
-	/**
-	 * Get the instance of the class.
-	 */
-	public static function get_instance() {
-		static $instance = null;
-
-		if ( null === $instance ) {
-			$instance = new self();
-		}
-
-		return $instance;
-	}
 }