fix: absolute inject file path support

xcz-ns · Jul 4, 2023 · 7bec1a6 · 7bec1a6
1 parent 96edb6f
commit 7bec1a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts
@@ -190,7 +190,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
       logger.error('The injected file must be in either CSS or JS format.');
       return;
     }
-    const files = inject.map(relativePath => path.join(process.cwd(), relativePath));
+    const files = inject.map(filepath => path.isAbsolute(filepath) ?  filepath : path.join(process.cwd(), filepath));
     tauriConf.pake.inject = files;
     await combineFiles(files, path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`));
   }

diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json
@@ -19,4 +19,5 @@
       "shortDescription": "",
       "targets": ["dmg"]
     }
-}
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,5 @@ @@
           "shortDescription": "",
           "targets": ["dmg"]
         }
-    }
+      }
+    }