@saltcorn/plugins-loader 1.6.0-beta.5 → 1.6.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/plugins-loader",
-  "version": "1.6.0-beta.5",
+  "version": "1.6.0-beta.6",
   "description": "Saltcorn plugin loader",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -9,7 +9,7 @@
     "clean": "echo 'No TypeScript build'"
   },
   "dependencies": {
-    "@saltcorn/data": "1.6.0-beta.5",
+    "@saltcorn/data": "1.6.0-beta.6",
     "env-paths": "^2.2.1",
     "npm-registry-fetch": "17.1.0",
     "https-proxy-agent": "^7.0.6"

package/plugin_installer.js

@@ -58,9 +58,10 @@ const npmInstallNeeded = (oldPckJSON, newPckJSON) => {
 
 const defaultRootFolder = envPaths("saltcorn", { suffix: "plugins" }).data;
 
-// tracks local plugins already copied in this process
-// is only checked in the master process
+// tracks plugins already installed in this process (master process only)
 const installedLocalPlugins = new Set();
+const installedGitPlugins = new Set();
+const installedGithubPlugins = new Set();
 
 /**
  * Find the most recently created localversion_<timestamp> directory for a local plugin.
@@ -267,9 +268,13 @@ class PluginInstaller {
         }
         break;
       case "github":
-        if (this.force || !folderExists) {
+        if (
+          (this.force || !folderExists) &&
+          (!installedGithubPlugins.has(this.pluginDir) || this.reloadModule)
+        ) {
           getState().log(6, "downloading from github");
           await downloadFromGithub(this.plugin, this.rootFolder, this.tempDir);
+          installedGithubPlugins.add(this.pluginDir);
           wasLoaded = true;
         }
         break;
@@ -288,10 +293,14 @@ class PluginInstaller {
         }
         break;
       case "git":
-        if (this.force || !folderExists) {
+        if (
+          (this.force || !folderExists) &&
+          (!installedGitPlugins.has(this.pluginDir) || this.reloadModule)
+        ) {
           getState().log(6, "downloading from git");
           await gitPullOrClone(this.plugin, this.tempDir);
           this.pckJsonPath = join(this.pluginDir, "package.json");
+          installedGitPlugins.add(this.pluginDir);
           wasLoaded = true;
         }
         break;