Fix Windows paths for new plugin runtime

This commit is contained in:
Gregory Schier
2024-08-09 12:43:56 -07:00
parent 331f1eb9b9
commit 48c239b7dc
3 changed files with 1952 additions and 1932 deletions

View File

@@ -8,9 +8,11 @@ import { parentPort, workerData } from 'node:worker_threads';
new Promise<void>(async (resolve, reject) => {
const { pluginDir /*, pluginRefId*/ } = workerData;
const pathMod = path.join(pluginDir, 'build/index.js');
const pathPkg = path.join(pluginDir, 'package.json');
// NOTE: Use POSIX join because require() needs forward slash
const pathMod = path.posix.join(pluginDir, 'build', 'index.js');
let pkg: { [x: string]: any };
try {
pkg = JSON.parse(readFileSync(pathPkg, 'utf8'));

File diff suppressed because it is too large Load Diff

View File

@@ -112,13 +112,12 @@ async fn read_plugins_dir(dir: &PathBuf) -> Result<Vec<String>> {
Ok(dirs)
}
#[cfg(target_os = "windows")]
fn fix_windows_paths(p: &PathBuf) -> String {
use dunce;
use regex::Regex;
use path_slash::PathBufExt;
use regex::Regex;
// 1. Remove UNC prefix for Windows paths to pass to sidecar
let safe_path = dunce::simplified(p.as_path()).to_string_lossy().to_string();