@saltcorn/plugins-loader 1.3.0-beta.13 → 1.3.0-beta.14

package/package.json

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

package/plugin_installer.js

@@ -62,7 +62,8 @@ class PluginInstaller {
     this.pluginDir = join(
       this.rootFolder,
       plugin.source === "git" ? "git_plugins" : "plugins_folder",
-      ...tokens
+      ...tokens,
+      plugin.version || "unknownversion"
     );
     this.pckJsonPath = join(this.pluginDir, "package.json");
     this.tempDir = join(this.tempRootFolder, "temp_install", ...tokens);
@@ -267,11 +268,10 @@ class PluginInstaller {
       // in jest, downgrad to require
       return require(normalize(join(this.pluginDir, pckJSON.main)));
     } else {
-      const res = await import(
-        `${isWindows ? `file://` : ""}${normalize(
-          join(this.pluginDir, pckJSON.main + (reload ? "?reload=true" : ""))
-        )}`
-      );
+      const url = `${isWindows ? `file://` : ""}${normalize(
+        join(this.pluginDir, pckJSON.main + (reload ? "?reload=true" : ""))
+      )}`;
+      const res = await import(url);
       return res.default;
     }
   }