Merge pull request #3 from kuno1/bugfix/lazy-load-warning

Bugfix/lazy load warning

composer.json

@@ -10,7 +10,9 @@
         }
     ],
     "minimum-stability": "stable",
-    "require": {},
+    "require": {
+        "php": ">=7.4.0"
+    },
     "autoload": {
         "psr-0": {
             "Kunoichi\\AssetsLazyLoader": "./src"

package.json

@@ -22,7 +22,6 @@
   },
   "homepage": "https://github.com/kuno1/assets-lazy-loader#readme",
   "devDependencies": {
-    "@wordpress/env": "^1.6.0",
-    "fg-loadcss": "^2.1.0"
+    "@wordpress/env": "9.0"
   }
 }

src/Kunoichi/AssetsLazyLoader/JqueryOptimizer.php

@@ -19,7 +19,7 @@ class JqueryOptimizer extends Singleton {
 	 */
 	protected function init() {
 		// Change jQuery path.
-		add_action( 'init', [ $this, 'enhance_jQuery' ], 1 );
+		add_action( 'wp_default_scripts', [ $this, 'enhance_jquery' ], 11 );
 		$this->setting = wp_parse_args( $this->setting );
 	}
 
@@ -39,16 +39,21 @@ protected function parse_args( $args ) {
 	}
 
 	/**
-	 * Change jQuery to
+	 * Change jQuery to footer.
+	 *
+	 * @param \WP_Scripts $wp_scripts
 	 */
-	public function enhance_jquery() {
+	public function enhance_jquery( $wp_scripts ) {
 		// Do nothing on admin screen.
 		// It's prohibit to remove jQuery.
 		if ( is_admin() || $this->is_login() ) {
 			return;
 		}
+		if ( ! isset( $wp_scripts->registered['jquery-core'] ) ) {
+			// jQuery is not registered.
+			return;
+		}
 		// Save current version.
-		global $wp_scripts;
 		$jquery     = $wp_scripts->registered['jquery-core'];
 		// Set jQuery version and src if specified.
 		// If not set, use default.
@@ -57,10 +62,9 @@ public function enhance_jquery() {
 		// Flag to move_footer.
 		$move_jquery_to_footer = (bool) $this->footer;
 		// Remove existing.
-		wp_deregister_script( 'jquery' );
-		wp_deregister_script( 'jquery-core' );
+		$wp_scripts->remove( [ 'jquery', 'jquery-core' ] );
 		// Register them again.
-		wp_register_script( 'jquery', false, [ 'jquery-core' ], $jquery_ver, $move_jquery_to_footer );
-		wp_register_script( 'jquery-core', $jquery_src, [], $jquery_ver, $move_jquery_to_footer );
+		$wp_scripts->add( 'jquery-core', $jquery_src, [], $jquery_ver, $move_jquery_to_footer );
+		$wp_scripts->add( 'jquery', false, [ 'jquery-core' ], $jquery_ver, $move_jquery_to_footer );
 	}
 }

src/Kunoichi/AssetsLazyLoader/StyleLoader.php

@@ -12,11 +12,6 @@
  */
 class StyleLoader extends HandleDetector {
 
-	/**
-	 * @var bool If set preload at least 1, enable.
-	 */
-	protected $preloaded = false;
-
 	/**
 	 * Get admin critical files.
 	 *
@@ -32,34 +27,15 @@ public static function admin_critical( $extra = [] ) {
 	 */
 	protected function init() {
 		add_filter( 'style_loader_tag', [ $this, 'style_loader_tag' ], 9999, 4 );
-		add_action( 'wp_head', [ $this, 'preload_helper' ], 100 );
-		if ( $this->in_login ) {
-			add_action( 'login_head', [ $this, 'preload_helper' ], 100 );
-		}
-		if ( $this->in_admin ) {
-			add_action( 'admin_head', [ $this, 'preload_helper' ], 100 );
-		}
 	}
 
 	/**
-	 * Render Helper JS if enabled.
-	 */
-	public function preload_helper() {
-		if ( ! $this->preloaded ) {
-			return;
-		}
-		$js = $this->dir . '/dist/fg-loadcss/cssrelpreload.min.js';
-		if ( ! file_exists( $js ) ) {
-			return;
-		}
-		printf( "<script>\n%s\n</script>", file_get_contents( $js ) );
-	}
-
-	/**
-	 * @param string $tag
-	 * @param string $handle
-	 * @param string $href
-	 * @param string $media
+	 * Change style loader tag.
+	 *
+	 * @param string $tag    HTML tag.
+	 * @param string $handle Handle name.
+	 * @param string $href   URL of CSS.
+	 * @param string $media  Media attribute.
 	 *
 	 * @return string
 	 */
@@ -72,22 +48,12 @@ public function style_loader_tag( $tag, $handle, $href, $media ) {
 			return $tag;
 		}
 		// Change stylesheet.
-		$this->preloaded = true;
-		$html = <<<'HTML'
-<link rel="preload" id="%1$s" href="%2$s" as="style" onload="this.onload=null;this.rel='stylesheet'" media="%4$s" />
-<noscript>
-	%3$s
-</noscript>
-HTML;
+		$html ='<link id="%1$s" rel="stylesheet" href="%2$s" onload="this.onload=null;this.media=\'%3$s\'" media="print" />';
 		return sprintf(
 			$html,
 			esc_attr( $handle . '-css' ),
 			esc_url( $href ),
-			$tag,
 			esc_attr( $media )
 		);
 	}
-
-
 }
-