🎨 fix https://github.com/siyuan-note/siyuan/issues/9553

app/src/boot/onGetConfig.ts

@@ -88,7 +88,7 @@ const hasKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "edito
     return match;
 };
 
-export const onGetConfig = async (isStart: boolean, app: App) => {
+export const onGetConfig = (isStart: boolean, app: App) => {
     const matchKeymap1 = matchKeymap(Constants.SIYUAN_KEYMAP.general, "general");
     const matchKeymap2 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.general, "editor", "general");
     const matchKeymap3 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.insert, "editor", "insert");
@@ -142,7 +142,6 @@ export const onGetConfig = async (isStart: boolean, app: App) => {
     appearance.onSetappearance(window.siyuan.config.appearance);
     initAssets();
     setInlineStyle();
-    await loadPlugins(app);
     renderSnippet();
     let resizeTimeout = 0;
     window.addEventListener("resize", () => {

app/src/index.ts

@@ -25,6 +25,7 @@ import {getAllTabs} from "./layout/getAll";
 import {getLocalStorage} from "./protyle/util/compatibility";
 import {getSearch} from "./util/functions";
 import {hideAllElements} from "./protyle/ui/hideElements";
+import {loadPlugins} from "./plugin/loader";
 import "./assets/scss/base.scss";
 
 export class App {
@@ -146,7 +147,7 @@ export class App {
             }),
         };
 
-        fetchPost("/api/system/getConf", {}, (response) => {
+        fetchPost("/api/system/getConf", {}, async (response) => {
             window.siyuan.config = response.data.conf;
             // 历史数据兼容，202306后可删除
             if (window.siyuan.config.uiLayout.left && !window.siyuan.config.uiLayout.left.data) {
@@ -163,6 +164,7 @@ export class App {
                     data: response.data.conf.uiLayout.bottom
                 };
             }
+            await loadPlugins(this);
             getLocalStorage(() => {
                 fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => {
                     window.siyuan.languages = lauguages;

app/src/mobile/index.ts

@@ -80,9 +80,10 @@ class App {
         window.addEventListener("pagehide", () => {
             saveScroll(window.siyuan.mobile.editor.protyle);
         }, false);
-        fetchPost("/api/system/getConf", {}, (confResponse) => {
+        fetchPost("/api/system/getConf", {}, async (confResponse) => {
             confResponse.data.conf.keymap = Constants.SIYUAN_KEYMAP;
             window.siyuan.config = confResponse.data.conf;
+            await loadPlugins(this);
             getLocalStorage(() => {
                 fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => {
                     window.siyuan.languages = lauguages;

app/src/mobile/util/MobileBackFoward.ts

@@ -109,6 +109,7 @@ const focusStack = (backStack: IBackStack) => {
 
 export const pushBack = () => {
     const protyle = getCurrentEditor().protyle;
+    if (protyle.wysiwyg.element.firstElementChild) {
         window.siyuan.backStack.push({
             id: protyle.block.showAll ? protyle.block.id : protyle.block.rootID,
             data: {
@@ -121,6 +122,7 @@ export const pushBack = () => {
             callback: protyle.block.action,
             zoomId: protyle.block.showAll ? protyle.block.id : undefined
         });
+    }
 };
 
 export const goBack = () => {

app/src/mobile/util/initFramework.ts

@@ -19,11 +19,9 @@ import {activeBlur, hideKeyboardToolbar, initKeyboardToolbar} from "./keyboardTo
 import {syncGuide} from "../../sync/syncGuide";
 import {Inbox} from "../../layout/dock/Inbox";
 import {App} from "../../index";
-import {loadPlugins} from "../../plugin/loader";
 
-export const initFramework = async (app: App) => {
+export const initFramework = (app: App) => {
     setInlineStyle();
-    await loadPlugins(app);
     renderSnippet();
     initKeyboardToolbar();
     const sidebarElement = document.getElementById("sidebar");

app/src/protyle/util/addStyle.ts

@@ -5,6 +5,11 @@ export const addStyle = (url: string, id: string) => {
         styleElement.rel = "stylesheet";
         styleElement.type = "text/css";
         styleElement.href = url;
+        const pluginsStyle = document.querySelector("#pluginsStyle");
+        if (pluginsStyle) {
+            pluginsStyle.before(styleElement);
+        } else {
             document.getElementsByTagName("head")[0].appendChild(styleElement);
         }
+    }
 };

app/src/util/assets.ts

@@ -229,7 +229,7 @@ export const setInlineStyle = (set = true) => {
         if (siyuanStyle) {
             siyuanStyle.innerHTML = style;
         } else {
-            document.head.insertAdjacentHTML("beforeend", `<style id="siyuanStyle">${style}</style>`);
+            document.querySelector("#pluginsStyle").insertAdjacentHTML("beforebegin", `<style id="siyuanStyle">${style}</style>`);
         }
     }
     return style;

app/src/window/index.ts

@@ -19,6 +19,7 @@ import {initMessage} from "../dialog/message";
 import {getAllTabs} from "../layout/getAll";
 import {getLocalStorage} from "../protyle/util/compatibility";
 import {init} from "../window/init";
+import {loadPlugins} from "../plugin/loader";
 
 class App {
     public plugins: import("../plugin").Plugin[] = [];
@@ -127,8 +128,9 @@ class App {
                 }
             }),
         };
-        fetchPost("/api/system/getConf", {}, (response) => {
+        fetchPost("/api/system/getConf", {}, async (response) => {
             window.siyuan.config = response.data.conf;
+            await loadPlugins(this);
             getLocalStorage(() => {
                 fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => {
                     window.siyuan.languages = lauguages;

app/src/window/init.ts

@@ -10,11 +10,11 @@ import {renderSnippet} from "../config/util/snippets";
 import {getSearch} from "../util/functions";
 import {initWindow} from "../boot/onGetConfig";
 import {App} from "../index";
-import {afterLoadPlugin, loadPlugins} from "../plugin/loader";
+import {afterLoadPlugin} from "../plugin/loader";
 import {Tab} from "../layout/Tab";
 import {initWindowEvent} from "../boot/globalEvent/event";
 
-export const init = async (app: App) => {
+export const init = (app: App) => {
     webFrame.setZoomFactor(window.siyuan.storage[Constants.LOCAL_ZOOM]);
     initWindowEvent(app);
     fetchPost("/api/system/getEmojiConf", {}, response => {
@@ -48,7 +48,6 @@ export const init = async (app: App) => {
     appearance.onSetappearance(window.siyuan.config.appearance);
     initAssets();
     setInlineStyle();
-    await loadPlugins(app);
     renderSnippet();
     let resizeTimeout = 0;
     window.addEventListener("resize", () => {