fix: make relativePath OS safe

oclif · Sep 11, 2023 · eaec901 · eaec901
1 parent 15b8f75
commit eaec901
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/command.ts b/src/command.ts
@@ -436,7 +436,7 @@ export namespace Command {
     permutations?: string[]
     aliasPermutations?: string[];
     isESM?: boolean;
-    relativePath?: string;
+    relativePath?: string[];
   }
 
   export type Flag = CompletableFlag<any>

diff --git a/src/config/plugin.ts b/src/config/plugin.ts
@@ -251,7 +251,7 @@ export class Plugin implements IPlugin {
       cmd.id = id
       cmd.plugin = this
       cmd.isESM = isESM
-      cmd.relativePath = path.relative(this.root, filePath || '')
+      cmd.relativePath = path.relative(this.root, filePath || '').split(path.sep)
       return cmd
     }
 

diff --git a/src/module-loader.ts b/src/module-loader.ts
@@ -103,7 +103,7 @@ export default class ModuleLoader {
       throw new ModuleLoadError(`Cached command ${id} does not have the isESM property set`)
     }
 
-    const filePath = path.join(modulePath, relativePath)
+    const filePath = path.join(modulePath, relativePath.join(path.sep))
     try {
       const module = isESM ? await import(url.pathToFileURL(filePath).href) : require(filePath)
       return {isESM, module, filePath}