perf(scripts): improve dependency loading and defer non-blocking assets

Smart Cloud Solutions Inc. · Smart Cloud Solutions Inc. · commit df50d0c4830e · 2026-04-01T18:04:23.000+02:00
diff --git a/ai-kit-admin/php/admin.php b/ai-kit-admin/php/admin.php
@@ -76,12 +76,14 @@ public function addMenu()
                 return;
             }
 
+            aiKit()->enqueueAdminRuntimeAssets();
+
             $script_asset = array();
             if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/index.asset.php')) {
                 $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/index.asset.php');
             }
             $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-wpsuite-webcrypto-vendor', 'smartcloud-wpsuite-mantine-vendor'));
-            $res = wp_enqueue_script('smartcloud-ai-kit-admin-script', SMARTCLOUD_AI_KIT_URL . 'admin/index.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+            $res = wp_enqueue_script('smartcloud-ai-kit-admin-script', SMARTCLOUD_AI_KIT_URL . 'admin/index.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
             // Make the blocks translatable.
             if (function_exists('wp_set_script_translations')) {
                 wp_set_script_translations('smartcloud-ai-kit-admin-script', 'smartcloud-ai-kit', SMARTCLOUD_AI_KIT_PATH . 'languages');
diff --git a/ai-kit-blocks/dist/ai-feature/block.json b/ai-kit-blocks/dist/ai-feature/block.json
@@ -147,10 +147,9 @@
     }
   },
   "textdomain": "wpsuite-ai-kit",
-  "editorScript": "file:./index.js",
-  "style": "file:./index.css",
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
   "render": "file:./render.php",
-  "viewScript": "file:./view.js",
+  "viewScript": "smartcloud-ai-kit-view-script",
   "supports": {
     "align": true,
     "__experimentalBorder": {
diff --git a/ai-kit-blocks/dist/doc-search/block.json b/ai-kit-blocks/dist/doc-search/block.json
@@ -84,8 +84,7 @@
   "supports": {
     "html": false
   },
-  "editorScript": "file:./index.js",
-  "style": "file:./index.css",
-  "viewScript": "file:./view.js",
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
+  "viewScript": "smartcloud-ai-kit-view-script",
   "render": "file:./render.php"
 }
diff --git a/ai-kit-blocks/dist/editor.asset.php b/ai-kit-blocks/dist/editor.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '1c4a6a33035ce93b7771');
diff --git a/ai-kit-blocks/dist/editor.css b/ai-kit-blocks/dist/editor.css
diff --git a/ai-kit-blocks/dist/editor.js b/ai-kit-blocks/dist/editor.js
diff --git a/ai-kit-blocks/dist/index.asset.php b/ai-kit-blocks/dist/index.asset.php
diff --git a/ai-kit-blocks/dist/index.js b/ai-kit-blocks/dist/index.js
diff --git a/ai-kit-blocks/dist/kb-section/block.json b/ai-kit-blocks/dist/kb-section/block.json
@@ -48,6 +48,6 @@
     "smartcloud-ai-kit/kb-section-mode": "mode",
     "smartcloud-ai-kit/kb-section-docKey": "docKey"
   },
-  "editorScript": "file:./index.js",
-  "editorStyle": "file:./index.css"
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
+  "editorStyle": "smartcloud-ai-kit-blocks-editor-style"
 }
diff --git a/ai-kit-blocks/dist/view.asset.php b/ai-kit-blocks/dist/view.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('jquery', 'react', 'react-dom', 'react-jsx-runtime', 'wp-data', 'wp-i18n'), 'version' => '3bfd415855ecf2513ebb');
diff --git a/ai-kit-blocks/dist/view.js b/ai-kit-blocks/dist/view.js
diff --git a/ai-kit-blocks/src/ai-feature/block.json b/ai-kit-blocks/src/ai-feature/block.json
@@ -147,10 +147,9 @@
     }
   },
   "textdomain": "wpsuite-ai-kit",
-  "editorScript": "file:./index.tsx",
-  "style": "file:./index.css",
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
   "render": "file:./render.php",
-  "viewScript": "file:./view.tsx",
+  "viewScript": "smartcloud-ai-kit-view-script",
   "supports": {
     "align": true,
     "__experimentalBorder": {
diff --git a/ai-kit-blocks/src/doc-search/block.json b/ai-kit-blocks/src/doc-search/block.json
@@ -84,8 +84,7 @@
   "supports": {
     "html": false
   },
-  "editorScript": "file:./index.tsx",
-  "style": "file:./index.css",
-  "viewScript": "file:./view.tsx",
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
+  "viewScript": "smartcloud-ai-kit-view-script",
   "render": "file:./render.php"
 }
diff --git a/ai-kit-blocks/src/editor.tsx b/ai-kit-blocks/src/editor.tsx
@@ -0,0 +1,5 @@
+import "./index";
+
+import "./ai-feature/index";
+import "./doc-search/index";
+import "./kb-section/index";
diff --git a/ai-kit-blocks/src/kb-section/block.json b/ai-kit-blocks/src/kb-section/block.json
@@ -48,6 +48,6 @@
     "smartcloud-ai-kit/kb-section-mode": "mode",
     "smartcloud-ai-kit/kb-section-docKey": "docKey"
   },
-  "editorScript": "file:./index.tsx",
-  "editorStyle": "file:./index.css"
+  "editorScript": "smartcloud-ai-kit-blocks-editor-script",
+  "editorStyle": "smartcloud-ai-kit-blocks-editor-style"
 }
diff --git a/ai-kit-blocks/webpack.config.cjs b/ai-kit-blocks/webpack.config.cjs
@@ -8,13 +8,10 @@ module.exports = function (env = {}) {
   const config = {
     ...defaultConfig,
     entry: {
-      index: [
-        path.resolve(process.cwd(), "src", "index.tsx"),
-        path.resolve(process.cwd(), "src/ai-feature", "index.tsx"),
+      editor: [path.resolve(process.cwd(), "src", "editor.tsx")],
+      view: [
         path.resolve(process.cwd(), "src/ai-feature", "view.tsx"),
-        path.resolve(process.cwd(), "src/doc-search", "index.tsx"),
         path.resolve(process.cwd(), "src/doc-search", "view.tsx"),
-        path.resolve(process.cwd(), "src/kb-section", "index.tsx"),
       ],
     },
     externals: {
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: ai, chrome, seo, language, tools
 Requires at least: 6.2
 Tested up to: 6.9
 Requires PHP: 8.1
-Stable tag: 1.2.8
+Stable tag: 1.2.9
 License: MIT
 License URI: https://mit-license.org/
 Text Domain: smartcloud-ai-kit
@@ -191,6 +191,10 @@ AI-Kit Pro includes additional functionality (such as the AI-Kit Chatbot, backen
 
 == Changelog ==
 
+= 1.2.9 =
+* Improved the robustness of script loading and dependency ordering for shared functions, blocks, and related assets.
+* Added defer loading where possible so scripts no longer block page rendering unnecessarily.
+
 = 1.2.8 =
 * UX: The AI Feature UI language can now be changed while the component is already running.
   Behavior: The language change is applied immediately to the user interface, without interrupting the currently running task.
@@ -302,6 +306,9 @@ Fixed the pre-run language detection/translation flow for AiFeature blocks so it
 
 == Upgrade Notice ==
 
+= 1.2.9 =
+This release improves how AI-Kit loads scripts and resolves dependencies, with broader use of deferred loading to reduce render-blocking during page load.
+
 = 1.2.8 =
 Improves AI Feature language switching. The UI language can now be changed even while the component is already running. The change takes effect immediately in the interface, while the current in-progress task continues uninterrupted with its original settings.
 
diff --git a/smartcloud-ai-kit.php b/smartcloud-ai-kit.php
@@ -6,7 +6,7 @@
  * Requires at least: 6.2
  * Tested up to:      6.9
  * Requires PHP:      8.1
- * Version:           1.2.8
+ * Version:           1.2.9
  * Author:            Smart Cloud Solutions Inc.
  * Author URI:        https://smart-cloud-solutions.com
  * License:           MIT
@@ -18,7 +18,7 @@
 
 namespace SmartCloud\WPSuite\AiKit;
 
-const VERSION = '1.2.8';
+const VERSION = '1.2.9';
 const DB_VERSION = '1.3.1';
 
 if (!defined('ABSPATH')) {
@@ -55,6 +55,13 @@ private function __construct()
         $this->includes();
     }
 
+    /** @var string[] */
+    private array $blocks = [
+        'ai-feature',
+        'doc-search',
+        'kb-section',
+    ];
+
     /**
      * Access the singleton instance.
      */
@@ -83,22 +90,17 @@ public function init(): void
         add_filter('bulk_actions-upload', array($this, 'registerMediaBulkActions'), 10, 1);
         add_filter('handle_bulk_actions-upload', array($this, 'handleMediaBulkAction'), 10, 3);
 
-        // Register Gutenberg blocks (summarizer etc.)
-        if (function_exists('register_block_type')) {
-            register_block_type(SMARTCLOUD_AI_KIT_PATH . 'blocks/ai-feature');
-            register_block_type(SMARTCLOUD_AI_KIT_PATH . 'blocks/doc-search');
-            register_block_type(SMARTCLOUD_AI_KIT_PATH . 'blocks/kb-section');
-        }
+        $this->registerBlocks();
 
         // Assets
-        add_action('wp_enqueue_scripts', array($this, 'enqueueAssets'), 20);
-        add_action('admin_init', array($this, 'enqueueAssets'), 20);
-        add_action('elementor/preview/after_enqueue_scripts', array($this, 'enqueueAssets'), 20);
+        add_action('wp_enqueue_scripts', array($this, 'enqueueFrontendAssets'), 20);
+        add_action('elementor/preview/after_enqueue_scripts', array($this, 'enqueueFrontendAssets'), 20);
 
         add_action('enqueue_block_editor_assets', array($this, 'enqueueEditorAssets'), 20);
+        add_filter('block_categories_all', array($this, 'registerBlockCategory'), 20, 2);
         add_action('admin_enqueue_scripts', array($this, 'enqueueAdminAssets'), 20);
-        // Hooks.
-        add_action('admin_menu', array($this, 'createAdminMenu'), 21);
+
+        add_action('admin_menu', array($this, 'createAdminMenu'), 20);
 
         // KB Admin hooks
         if ($this->kbAdmin) {
@@ -109,9 +111,6 @@ public function init(): void
         add_shortcode('smartcloud-ai-kit-feature', array($this, 'shortcodeFeature'));
         add_shortcode('smartcloud-ai-kit-doc-search', array($this, 'shortcodeDocSearch'));
 
-        // Category for custom blocks.
-        add_filter('block_categories_all', array($this, 'registerBlockCategory'), 20, 2);
-
         add_filter('no_texturize_shortcodes', function ($shortcodes) {
             $shortcodes[] = 'smartcloud-ai-kit-feature';
             $shortcodes[] = 'smartcloud-ai-kit-doc-search';
@@ -215,10 +214,24 @@ public function registerBlockCategory(array $categories, \WP_Block_Editor_Contex
         return $categories;
     }
 
+    public function registerBlocks(): void
+    {
+        if (!function_exists('register_block_type')) {
+            return;
+        }
+
+        foreach ($this->blocks as $block) {
+            $metadata_path = SMARTCLOUD_AI_KIT_PATH . 'blocks/' . $block;
+            if (file_exists($metadata_path . '/block.json')) {
+                register_block_type($metadata_path);
+            }
+        }
+    }
+
     /**
      * Enqueue inline scripts that expose PHP constants to JS.
      */
-    public function enqueueAssets(): void
+    private function enqueueMainRuntimeScript(): void
     {
         $main_script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'main/index.asset.php')) {
@@ -232,18 +245,9 @@ public function enqueueAssets(): void
             $main_script_dependencies[] = 'smartcloud-wpsuite-main-script';
         }
         $main_script_asset['dependencies'] = array_values(array_unique($main_script_dependencies));
-        wp_enqueue_script('smartcloud-ai-kit-main-script', SMARTCLOUD_AI_KIT_URL . 'main/index.js', $main_script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, false);
-        wp_enqueue_style('smartcloud-ai-kit-main-style', SMARTCLOUD_AI_KIT_URL . 'main/index.css', array(), SMARTCLOUD_AI_KIT_VERSION);
-        add_editor_style(SMARTCLOUD_AI_KIT_URL . 'main/index.css');
-
-        $blocks_script_asset = array();
-        if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'blocks/index.asset.php')) {
-            $blocks_script_asset = require(SMARTCLOUD_AI_KIT_PATH . 'blocks/index.asset.php');
-        }
-        $blocks_script_asset['dependencies'] = array_merge($blocks_script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-blocks-script', SMARTCLOUD_AI_KIT_URL . 'blocks/index.js', $blocks_script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, false);
-        wp_enqueue_style('smartcloud-ai-kit-blocks-style', SMARTCLOUD_AI_KIT_URL . 'blocks/index.css', array(), SMARTCLOUD_AI_KIT_VERSION);
-        add_editor_style(SMARTCLOUD_AI_KIT_URL . 'blocks/index.css');
+        wp_enqueue_script('smartcloud-ai-kit-main-script', SMARTCLOUD_AI_KIT_URL . 'main/index.js', $main_script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
+        //wp_enqueue_style('smartcloud-ai-kit-main-style', SMARTCLOUD_AI_KIT_URL . 'main/index.css', array(), SMARTCLOUD_AI_KIT_VERSION);
+        //add_editor_style(SMARTCLOUD_AI_KIT_URL . 'main/index.css');
 
         // Build data passed to JS.
         $settings = $this->admin->getSettings();
@@ -275,6 +279,49 @@ public function enqueueAssets(): void
         wp_add_inline_script('smartcloud-ai-kit-main-script', $js, 'before');
     }
 
+    private function enqueueFormViewAssets(): void
+    {
+        $view_script_asset = array();
+        if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'blocks/view.asset.php')) {
+            $view_script_asset = require(SMARTCLOUD_AI_KIT_PATH . 'blocks/view.asset.php');
+        }
+        $view_script_dependencies = array_merge(
+            $view_script_asset['dependencies'] ?? array(),
+            array('smartcloud-ai-kit-main-script')
+        );
+        if (wp_script_is('smartcloud-wpsuite-main-script', 'registered')) {
+            $view_script_dependencies[] = 'smartcloud-wpsuite-main-script';
+        }
+        $view_script_asset['dependencies'] = array_values(array_unique($view_script_dependencies));
+        wp_enqueue_script('smartcloud-ai-kit-view-script', SMARTCLOUD_AI_KIT_URL . 'blocks/view.js', $view_script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
+    }
+
+    public function enqueueFrontendAssets(): void
+    {
+        $this->enqueueMainRuntimeScript();
+        $this->enqueueFormViewAssets();
+    }
+
+    public function enqueueAdminRuntimeAssets(): void
+    {
+        $this->enqueueMainRuntimeScript();
+    }
+
+    public function enqueueEditorAssets(): void
+    {
+        $this->enqueueMainRuntimeScript();
+        $this->registerEditorRuntimeAssets();
+
+        if (file_exists(SMARTCLOUD_AI_KIT_PATH . 'blocks/editor.css')) {
+            wp_enqueue_style(
+                'smartcloud-ai-kit-blocks-editor-style',
+                SMARTCLOUD_AI_KIT_URL . 'blocks/editor.css',
+                array(),
+                SMARTCLOUD_AI_KIT_VERSION
+            );
+        }
+    }
+
     public function enqueueAdminAssets($hook): void
     {
         if ($hook !== 'upload.php' && $hook !== 'post.php') {
@@ -288,45 +335,56 @@ public function enqueueAdminAssets($hook): void
                 return;
         }
 
+        $this->enqueueAdminRuntimeAssets();
+
         $script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/media.asset.php')) {
             $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/media.asset.php');
         }
         $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-media-script', SMARTCLOUD_AI_KIT_URL . 'admin/media.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+        wp_enqueue_script('smartcloud-ai-kit-media-script', SMARTCLOUD_AI_KIT_URL . 'admin/media.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
     }
 
     /**
      * Enqueue inline editor scripts that expose PHP constants to JS.
      */
-    public function enqueueEditorAssets(): void
+    private function registerEditorRuntimeAssets(): void
     {
+        $blocks_script_asset = array();
+        if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'blocks/editor.asset.php')) {
+            $blocks_script_asset = require(SMARTCLOUD_AI_KIT_PATH . 'blocks/editor.asset.php');
+        }
+        $blocks_script_asset['dependencies'] = array_merge($blocks_script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
+        wp_enqueue_script('smartcloud-ai-kit-blocks-editor-script', SMARTCLOUD_AI_KIT_URL . 'blocks/editor.js', $blocks_script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
+        wp_enqueue_style('smartcloud-ai-kit-blocks-editor-style', SMARTCLOUD_AI_KIT_URL . 'blocks/editor.css', array(), SMARTCLOUD_AI_KIT_VERSION);
+        add_editor_style(SMARTCLOUD_AI_KIT_URL . 'blocks/editor.css');
+
         $script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/media.asset.php')) {
             $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/media.asset.php');
         }
         $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-media-script', SMARTCLOUD_AI_KIT_URL . 'admin/media.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+        wp_enqueue_script('smartcloud-ai-kit-media-script', SMARTCLOUD_AI_KIT_URL . 'admin/media.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
         $script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/sidebar.asset.php')) {
             $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/sidebar.asset.php');
         }
         $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-sidebar-script', SMARTCLOUD_AI_KIT_URL . 'admin/sidebar.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+        wp_enqueue_script('smartcloud-ai-kit-sidebar-script', SMARTCLOUD_AI_KIT_URL . 'admin/sidebar.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
 
         $script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/langutils.asset.php')) {
             $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/langutils.asset.php');
         }
         $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-langutils-script', SMARTCLOUD_AI_KIT_URL . 'admin/langutils.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+        wp_enqueue_script('smartcloud-ai-kit-langutils-script', SMARTCLOUD_AI_KIT_URL . 'admin/langutils.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
 
         $script_asset = array();
         if (file_exists(filename: SMARTCLOUD_AI_KIT_PATH . 'admin/imgextra.asset.php')) {
             $script_asset = require_once(SMARTCLOUD_AI_KIT_PATH . 'admin/imgextra.asset.php');
         }
         $script_asset['dependencies'] = array_merge($script_asset['dependencies'], array('smartcloud-ai-kit-main-script'));
-        wp_enqueue_script('smartcloud-ai-kit-imgextra-script', SMARTCLOUD_AI_KIT_URL . 'admin/imgextra.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, true);
+        wp_enqueue_script('smartcloud-ai-kit-imgextra-script', SMARTCLOUD_AI_KIT_URL . 'admin/imgextra.js', $script_asset['dependencies'], SMARTCLOUD_AI_KIT_VERSION, array('strategy' => 'defer'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '1c4a6a33035ce93b7771');`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@`
`48`	`48`	`"smartcloud-ai-kit/kb-section-mode": "mode",`
`49`	`49`	`"smartcloud-ai-kit/kb-section-docKey": "docKey"`
`50`	`50`	`},`
`51`		`- "editorScript": "file:./index.js",`
`52`		`- "editorStyle": "file:./index.css"`
	`51`	`+ "editorScript": "smartcloud-ai-kit-blocks-editor-script",`
	`52`	`+ "editorStyle": "smartcloud-ai-kit-blocks-editor-style"`
`53`	`53`	`}`