Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 The plugin was not executed uninstall() when being uninstalled (#16243)

Browse source 
fix https://github.com/siyuan-note/siyuan/issues/16156
This commit is contained in:
Jeffrey Chen 2025-11-02 17:48:24 +08:00 • committed by GitHub
parent a156dc9671
commit 33d63127b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/config/bazaar.ts
View file

@ -838,9 +838,6 @@ export const bazaar = {
}, response => {
this._genMyHTML(bazaarType, app);
bazaar._onBazaar(response, bazaarType, ["themes", "icons"].includes(bazaarType));
if (bazaarType === "plugins") {
uninstall(app, packageName, true);
}
});
});
}
@ -923,7 +920,7 @@ export const bazaar = {
if (window.siyuan.config.bazaar.petalDisabled) {
bazaar.element.querySelectorAll("#configBazaarDownloaded .b3-card").forEach(item => {
item.classList.add("b3-card--disabled");
uninstall(app, JSON.parse(item.getAttribute("data-obj")).name);
uninstall(app, JSON.parse(item.getAttribute("data-obj")).name, false);
});
} else {
bazaar.element.querySelectorAll("#configBazaarDownloaded .b3-card").forEach(item => {
@ -961,7 +958,7 @@ export const bazaar = {
}
});
} else {
uninstall(app, dataObj.name);
uninstall(app, dataObj.name, false);
target.parentElement.querySelector('[data-type="setting"]').classList.add("fn__none");
}
});

7
app/src/plugin/loader.ts
View file

@ -211,8 +211,11 @@ export const afterLoadPlugin = (plugin: Plugin) => {
};
export const reloadPlugin = async (app: App, data: { upsertPlugins: string[], removePlugins: string[] }) => {
data.removePlugins.concat(data.upsertPlugins).forEach((item) => {
uninstall(app, item);
data.removePlugins.forEach((item) => {
uninstall(app, item, true);
});
data.upsertPlugins.forEach((item) => {
uninstall(app, item, false);
});
loadPlugins(app, data.upsertPlugins).then(() => {
app.plugins.forEach(item => {

19
app/src/plugin/uninstall.ts
View file

@ -1,5 +1,5 @@
import {App} from "../index";
import {Plugin} from "../plugin";
import {Plugin} from "./index";
/// #if !MOBILE
import {getAllModels} from "../layout/getAll";
import {resizeTopBar} from "../layout/util";
@ -8,20 +8,23 @@ import {Constants} from "../constants";
import {setStorageVal} from "../protyle/util/compatibility";
import {getAllEditor} from "../layout/getAll";
export const uninstall = (app: App, name: string, isUninstall = false) => {
export const uninstall = (app: App, name: string, isUninstall: boolean) => {
app.plugins.find((plugin: Plugin, index) => {
if (plugin.name === name) {
// rm command
try {
plugin.onunload();
if (isUninstall) {
plugin.uninstall();
window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {};
setStorageVal(Constants.LOCAL_PLUGIN_DOCKS, window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS]);
}
} catch (e) {
console.error(`plugin ${plugin.name} onunload error:`, e);
}
if (isUninstall) {
try {
plugin.uninstall();
} catch (e) {
console.error(`plugin ${plugin.name} uninstall error:`, e);
}
window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {};
setStorageVal(Constants.LOCAL_PLUGIN_DOCKS, window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS]);
}
// rm tab
/// #if !MOBILE
const modelsKeys = Object.keys(plugin.models);