@elementspanel/epanel-plugin-file 1.0.2 → 1.0.3

package/daemon/backend/index.cjs

@@ -2884,9 +2884,9 @@ function recordFromPackage(pluginId, name, source, packageRoot, metadata, side)
 /**
  * Every npm plugin the runtime can load for a side, built-in and project-installed.
  *
- * Built-in mappings win over a project mapping for the same id: a third-party
- * package must not shadow a plugin that ships with the runtime. A project package
- * that does not describe the requested side is skipped instead of failing, which
+ * Built-in package names win over a project mapping for the same id. An explicit
+ * project dependency on that same package selects the user's installed version.
+ * A project package that does not describe the requested side is skipped instead of failing, which
  * is what lets a two-sided project share one dependency list between sides.
  */
 function listNpmPlugins(side, options = {}) {
@@ -2923,7 +2923,10 @@ function listNpmPlugins(side, options = {}) {
             continue;
         if (dependenciesOf(host)[name] === undefined)
             continue;
-        mappings.set(pluginId, { name, source: "bundled" });
+        mappings.set(pluginId, {
+            name,
+            source: dependenciesOf(project)[name] === undefined ? "bundled" : "project"
+        });
     }
     const hostDependencies = dependenciesOf(host);
     const projectDependencies = dependenciesOf(project);
@@ -3098,9 +3101,9 @@ async function installNpmPlugin(options) {
         if (!host)
             throw new Error(`Missing runtime package metadata: ${packageRoot}`);
         const hostId = Object.entries(mappingsOf(host)).find(([, value]) => value === name && dependenciesOf(host)[name] !== undefined)?.[0];
-        const targetRoot = hostId ? packageRoot : projectRoot;
-        if (hostId && isEssentialNpmPlugin(hostId))
-            throw new Error(`The essential plugin "${hostId}" cannot be replaced while running.`);
+        const targetRoot = hostId && dependenciesOf(readProjectManifest(projectRoot))[name] === undefined
+            ? packageRoot
+            : projectRoot;
         if (options.pluginId &&
             mappingsOf(host)[options.pluginId] &&
             dependenciesOf(host)[String(mappingsOf(host)[options.pluginId])] !== undefined &&
@@ -3147,7 +3150,7 @@ async function installNpmPlugin(options) {
             const mapped = mappingsOf(readProjectManifest(targetRoot))[pluginId];
             if (mapped !== undefined && mapped !== name)
                 throw new Error(`Plugin id ${pluginId} is already installed as ${String(mapped)}.`);
-            const record = recordFromPackage(pluginId, name, hostId ? "bundled" : "project", entry.root, entry.metadata, side);
+            const record = recordFromPackage(pluginId, name, targetRoot === packageRoot ? "bundled" : "project", entry.root, entry.metadata, side);
             if (!record)
                 throw new Error(`The package ${name} does not provide a ${side} plugin named ${pluginId}.`);
             if (/^[0-9]/.test(version) && record.version !== version)
@@ -3230,7 +3233,9 @@ async function uninstallNpmPlugin(pluginId, options = {}) {
     return withProjectLock(projectRoot, async () => {
         const host = readJson(path_1.default.join(packageRoot, "package.json"));
         const bundledName = mappingsOf(host)[pluginId];
-        const targetRoot = typeof bundledName === "string" && dependenciesOf(host)[bundledName] !== undefined
+        const targetRoot = typeof bundledName === "string" &&
+            dependenciesOf(host)[bundledName] !== undefined &&
+            dependenciesOf(readProjectManifest(projectRoot))[bundledName] === undefined
             ? packageRoot
             : projectRoot;
         const manifest = readProjectManifest(targetRoot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementspanel/epanel-plugin-file",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Instance file management, editing and transfers.",
   "license": "Apache-2.0",
   "author": "Csituka_D <694428809@qq.com> (https://github.com/JessDaodao)",
@@ -50,8 +50,8 @@
     }
   },
   "peerDependencies": {
-    "@elementspanel/panel": "1.0.1",
-    "@elementspanel/daemon": "1.0.1"
+    "@elementspanel/panel": "^1.0.2",
+    "@elementspanel/daemon": "^1.0.2"
   },
   "peerDependenciesMeta": {
     "@elementspanel/panel": {