diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index 5645383..1adcb64 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -302,13 +302,15 @@ StartupNotify=true // inject js or css files if (inject?.length > 0) { + // Ensure inject is an array before calling .every() + const injectArray = Array.isArray(inject) ? inject : [inject]; if ( - !inject.every((item) => item.endsWith('.css') || item.endsWith('.js')) + !injectArray.every((item) => item.endsWith('.css') || item.endsWith('.js')) ) { logger.error('The injected file must be in either CSS or JS format.'); return; } - const files = inject.map((filepath) => + const files = injectArray.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath), ); tauriConf.pake.inject = files; diff --git a/dist/cli.js b/dist/cli.js index 61aef9e..83a5573 100755 --- a/dist/cli.js +++ b/dist/cli.js @@ -548,11 +548,13 @@ StartupNotify=true const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`); // inject js or css files if (inject?.length > 0) { - if (!inject.every((item) => item.endsWith('.css') || item.endsWith('.js'))) { + // Ensure inject is an array before calling .every() + const injectArray = Array.isArray(inject) ? inject : [inject]; + if (!injectArray.every((item) => item.endsWith('.css') || item.endsWith('.js'))) { logger.error('The injected file must be in either CSS or JS format.'); return; } - const files = inject.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)); + const files = injectArray.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)); tauriConf.pake.inject = files; await combineFiles(files, injectFilePath); }