lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fix the array issue in inject

Browse Source
This commit is contained in:
Tw93
2025-08-31 19:26:38 +08:00
parent 1ee8189235
commit c6e360505a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/helpers/merge.ts vendored
View File

@@ -302,13 +302,15 @@ StartupNotify=true
// inject js or css files // inject js or css files
if (inject?.length > 0) { if (inject?.length > 0) {
// Ensure inject is an array before calling .every()
const injectArray = Array.isArray(inject) ? inject : [inject];
if ( 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.'); logger.error('The injected file must be in either CSS or JS format.');
return; return;
} }
const files = inject.map((filepath) => const files = injectArray.map((filepath) =>
path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath), path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath),
); );
tauriConf.pake.inject = files; tauriConf.pake.inject = files;

6
dist/cli.js vendored
View File

@@ -548,11 +548,13 @@ StartupNotify=true
const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`); const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`);
// inject js or css files // inject js or css files
if (inject?.length > 0) { 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.'); logger.error('The injected file must be in either CSS or JS format.');
return; 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; tauriConf.pake.inject = files;
await combineFiles(files, injectFilePath); await combineFiles(files, injectFilePath);
} }