@tomjs/vite-plugin-vscode 2.3.0 → 2.3.1

package/dist/index.js

@@ -1,5 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/index.ts
 var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
+var _os = require('os'); var _os2 = _interopRequireDefault(_os);
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process');
 var _lodashclonedeep = require('lodash.clonedeep'); var _lodashclonedeep2 = _interopRequireDefault(_lodashclonedeep);
@@ -56,11 +57,11 @@ var createLogger = (tag) => {
 };
 
 // src/utils.ts
-var _child_process = require('child_process');
 
 var _module = require('module');
 
 
+var _execa = require('execa'); var _execa2 = _interopRequireDefault(_execa);
 function readJson(path3) {
   if (_fs2.default.existsSync(path3)) {
     return JSON.parse(_fs2.default.readFileSync(path3, "utf8"));
@@ -96,40 +97,32 @@ function resolveServerUrl(server) {
     return url;
   }
 }
-function getWebviewNpmPath() {
-  let npmPath = _path2.default.join(_process.cwd.call(void 0, ), "node_modules", WEBVIEW_PACKAGE_NAME);
-  if (!_fs2.default.existsSync(npmPath)) {
-    try {
-      const res = _child_process.spawnSync.call(void 0, 
-        process.platform === "win32" ? "pnpm.cmd" : "pnpm",
-        ["list", "--dev", "--depth=1", "--json"],
-        {
-          // stdio: ['inherit', 'ignore'],
-          cwd: process.cwd(),
-          encoding: "utf-8"
-        }
-      );
-      if (res.status === 0 && res.stdout) {
-        const list = JSON.parse(res.stdout.trim());
-        if (list.length === 0) {
-          return;
-        }
-        const self = (list[0].devDependencies || {})[PACKAGE_NAME];
-        if (!self) {
-          return;
-        }
-        const dep = self.dependencies[WEBVIEW_PACKAGE_NAME];
-        if (dep) {
-          npmPath = dep.path;
-        }
+function getWebviewPnpmPath() {
+  try {
+    const res = _execa2.default.sync("pnpm", ["list", "--dev", "--depth=1", "--json"], {});
+    if (res.stdout) {
+      const list = JSON.parse(res.stdout.trim());
+      if (list.length === 0) {
+        return;
+      }
+      const self = (list[0].devDependencies || {})[PACKAGE_NAME];
+      if (!self) {
+        return;
+      }
+      const dep = self.dependencies[WEBVIEW_PACKAGE_NAME];
+      if (dep) {
+        return dep.path;
       }
-    } catch (e) {
-      npmPath = "";
-    }
-    if (npmPath) {
-      return _path2.default.join(npmPath, "dist");
     }
+  } catch (e) {
+  }
+}
+function getWebviewNpmPath() {
+  const npmPath = _path2.default.join(_process.cwd.call(void 0, ), "node_modules", WEBVIEW_PACKAGE_NAME);
+  if (_fs2.default.existsSync(npmPath)) {
+    return npmPath;
   }
+  return getWebviewPnpmPath();
 }
 
 // src/index.ts
@@ -263,7 +256,13 @@ export default function getWebviewHtml(webview: Webview, context: ExtensionConte
   `
   );
   _fs2.default.writeFileSync(destFile, code, { encoding: "utf8" });
-  return destFile.replaceAll("\\", "/");
+  return fixWindowsPath(destFile);
+}
+function fixWindowsPath(webviewPath) {
+  if (_os2.default.platform() === "win32") {
+    webviewPath = webviewPath.replaceAll("\\", "/");
+  }
+  return webviewPath;
 }
 function useVSCodePlugin(options) {
   const opts = preMergeOptions(options);
@@ -297,19 +296,22 @@ function useVSCodePlugin(options) {
       }
     };
   };
-  let webviewClient;
-  let webviewNpmPath;
+  let devWebviewClient;
+  let devWebviewPath;
   if (opts.webview) {
-    webviewNpmPath = getWebviewNpmPath();
-    if (!webviewNpmPath || !_fs2.default.existsSync(webviewNpmPath)) {
+    devWebviewPath = getWebviewNpmPath();
+    if (devWebviewPath && _os2.default.platform() === "win32") {
+      devWebviewPath = devWebviewPath.replaceAll("\\", "/");
+    }
+    if (!devWebviewPath || !_fs2.default.existsSync(devWebviewPath)) {
       logger.warn(`[${WEBVIEW_PACKAGE_NAME}] is not installed, please install it first!`);
     } else {
       const fileName = "client.global.js";
-      const clientFile = _path2.default.join(webviewNpmPath, fileName);
+      const clientFile = _path2.default.join(devWebviewPath, "dist", fileName);
       if (!_fs2.default.existsSync(clientFile)) {
         logger.warn(`[${fileName}] is does not exist, please update the package!`);
       } else {
-        webviewClient = _fs2.default.readFileSync(clientFile, "utf-8");
+        devWebviewClient = _fs2.default.readFileSync(clientFile, "utf-8");
       }
     }
   }
@@ -349,7 +351,7 @@ function useVSCodePlugin(options) {
                       const file = _fs2.default.readFileSync(args.path, "utf-8");
                       if (file.includes(`${webview.name}(`)) {
                         return {
-                          contents: `import ${webview.name} from '@tomjs/vscode-extension-webview';
+                          contents: `import ${webview.name} from '${devWebviewPath}';
 ` + file,
                           loader: "ts"
                         };
@@ -374,10 +376,10 @@ function useVSCodePlugin(options) {
         });
       },
       transformIndexHtml(html) {
-        if (!opts.webview || !webviewClient) {
+        if (!opts.webview || !devWebviewClient) {
           return html;
         }
-        return html.replace(/<\/title>/i, `</title><script>${webviewClient}</script>`);
+        return html.replace(/<\/title>/i, `</title><script>${devWebviewClient}</script>`);
       }
     },
     {

package/dist/index.mjs

@@ -1,5 +1,6 @@
 // src/index.ts
 import fs2 from "fs";
+import os from "os";
 import path2 from "path";
 import { cwd as cwd2 } from "process";
 import cloneDeep from "lodash.clonedeep";
@@ -56,10 +57,10 @@ var createLogger = (tag) => {
 };
 
 // src/utils.ts
-import { spawnSync } from "child_process";
 import fs from "fs";
 import path from "path";
 import { cwd } from "process";
+import execa from "execa";
 function readJson(path3) {
   if (fs.existsSync(path3)) {
     return JSON.parse(fs.readFileSync(path3, "utf8"));
@@ -95,40 +96,32 @@ function resolveServerUrl(server) {
     return url;
   }
 }
-function getWebviewNpmPath() {
-  let npmPath = path.join(cwd(), "node_modules", WEBVIEW_PACKAGE_NAME);
-  if (!fs.existsSync(npmPath)) {
-    try {
-      const res = spawnSync(
-        process.platform === "win32" ? "pnpm.cmd" : "pnpm",
-        ["list", "--dev", "--depth=1", "--json"],
-        {
-          // stdio: ['inherit', 'ignore'],
-          cwd: process.cwd(),
-          encoding: "utf-8"
-        }
-      );
-      if (res.status === 0 && res.stdout) {
-        const list = JSON.parse(res.stdout.trim());
-        if (list.length === 0) {
-          return;
-        }
-        const self = (list[0].devDependencies || {})[PACKAGE_NAME];
-        if (!self) {
-          return;
-        }
-        const dep = self.dependencies[WEBVIEW_PACKAGE_NAME];
-        if (dep) {
-          npmPath = dep.path;
-        }
+function getWebviewPnpmPath() {
+  try {
+    const res = execa.sync("pnpm", ["list", "--dev", "--depth=1", "--json"], {});
+    if (res.stdout) {
+      const list = JSON.parse(res.stdout.trim());
+      if (list.length === 0) {
+        return;
+      }
+      const self = (list[0].devDependencies || {})[PACKAGE_NAME];
+      if (!self) {
+        return;
+      }
+      const dep = self.dependencies[WEBVIEW_PACKAGE_NAME];
+      if (dep) {
+        return dep.path;
       }
-    } catch {
-      npmPath = "";
-    }
-    if (npmPath) {
-      return path.join(npmPath, "dist");
     }
+  } catch {
+  }
+}
+function getWebviewNpmPath() {
+  const npmPath = path.join(cwd(), "node_modules", WEBVIEW_PACKAGE_NAME);
+  if (fs.existsSync(npmPath)) {
+    return npmPath;
   }
+  return getWebviewPnpmPath();
 }
 
 // src/index.ts
@@ -262,7 +255,13 @@ export default function getWebviewHtml(webview: Webview, context: ExtensionConte
   `
   );
   fs2.writeFileSync(destFile, code, { encoding: "utf8" });
-  return destFile.replaceAll("\\", "/");
+  return fixWindowsPath(destFile);
+}
+function fixWindowsPath(webviewPath) {
+  if (os.platform() === "win32") {
+    webviewPath = webviewPath.replaceAll("\\", "/");
+  }
+  return webviewPath;
 }
 function useVSCodePlugin(options) {
   const opts = preMergeOptions(options);
@@ -296,19 +295,22 @@ function useVSCodePlugin(options) {
       }
     };
   };
-  let webviewClient;
-  let webviewNpmPath;
+  let devWebviewClient;
+  let devWebviewPath;
   if (opts.webview) {
-    webviewNpmPath = getWebviewNpmPath();
-    if (!webviewNpmPath || !fs2.existsSync(webviewNpmPath)) {
+    devWebviewPath = getWebviewNpmPath();
+    if (devWebviewPath && os.platform() === "win32") {
+      devWebviewPath = devWebviewPath.replaceAll("\\", "/");
+    }
+    if (!devWebviewPath || !fs2.existsSync(devWebviewPath)) {
       logger.warn(`[${WEBVIEW_PACKAGE_NAME}] is not installed, please install it first!`);
     } else {
       const fileName = "client.global.js";
-      const clientFile = path2.join(webviewNpmPath, fileName);
+      const clientFile = path2.join(devWebviewPath, "dist", fileName);
       if (!fs2.existsSync(clientFile)) {
         logger.warn(`[${fileName}] is does not exist, please update the package!`);
       } else {
-        webviewClient = fs2.readFileSync(clientFile, "utf-8");
+        devWebviewClient = fs2.readFileSync(clientFile, "utf-8");
       }
     }
   }
@@ -348,7 +350,7 @@ function useVSCodePlugin(options) {
                       const file = fs2.readFileSync(args.path, "utf-8");
                       if (file.includes(`${webview.name}(`)) {
                         return {
-                          contents: `import ${webview.name} from '@tomjs/vscode-extension-webview';
+                          contents: `import ${webview.name} from '${devWebviewPath}';
 ` + file,
                           loader: "ts"
                         };
@@ -373,10 +375,10 @@ function useVSCodePlugin(options) {
         });
       },
       transformIndexHtml(html) {
-        if (!opts.webview || !webviewClient) {
+        if (!opts.webview || !devWebviewClient) {
           return html;
         }
-        return html.replace(/<\/title>/i, `</title><script>${webviewClient}</script>`);
+        return html.replace(/<\/title>/i, `</title><script>${devWebviewClient}</script>`);
       }
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomjs/vite-plugin-vscode",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Use vue/react to develop 'vscode extension webview', supporting esm/cjs",
   "keywords": [
     "vite",
@@ -46,6 +46,7 @@
   "dependencies": {
     "@tomjs/vscode-extension-webview": "^1.2.0",
     "dayjs": "^1.11.10",
+    "execa": "^5.1.1",
     "kolorist": "^1.8.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",