Skip to content

🐛 fix inject single file error #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dawn-lc wants to merge 2 commits into from
Closed

🐛 fix inject single file error #968

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6bea92
🐛 fix inject single file error
dawn-lc May 10, 2025
78cc2e9
🐛 fix inject single file error
dawn-lc May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions bin/helpers/merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,16 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
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'))) {
let injects = inject && Array.isArray(inject) ? inject : []
if (inject && typeof inject === 'string') {
injects.push(inject);
}
if (injects.length > 0) {
if (!injects.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 = injects.map(filepath => (path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)));
tauriConf.pake.inject = files;
await combineFiles(files, injectFilePath);
} else {
Expand Down