Skip to content

fix: use git ls-files for sources zip to respect .gitignore #2212

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

Open
creeperkatze wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −4
Open

fix: use git ls-files for sources zip to respect .gitignore #2212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions packages/wxt/src/core/zip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { InlineConfig } from '../types';
import path from 'node:path';
import { execSync } from 'node:child_process';
import { mkdir, readFile } from 'node:fs/promises';
import { createWriteStream } from 'node:fs';
import { safeFilename } from './utils/strings';
Expand Down Expand Up @@ -76,6 +77,7 @@ export async function zip(config?: InlineConfig): Promise<string[]> {
await zipDir(wxt.config.zip.sourcesRoot, sourcesZipPath, {
include: wxt.config.zip.includeSources,
exclude: excludeSources,
useGit: true,
transform(absolutePath, zipPath, content) {
if (zipPath.endsWith('package.json')) {
return addOverridesToPackageJson(absolutePath, content, overrides);
Expand Down Expand Up @@ -105,6 +107,7 @@ async function zipDir(
options?: {
include?: string[];
exclude?: string[];
useGit?: boolean;
transform?: (
absolutePath: string,
zipPath: string,
Expand All @@ -115,15 +118,33 @@ async function zipDir(
},
): Promise<void> {
const archive = new JSZip();
const files = (
await glob(['**/*', ...(options?.include || [])], {

const globFiles = () =>
glob(['**/*', ...(options?.include || [])], {
cwd: directory,
// Ignore node_modules, otherwise this glob step takes forever
ignore: ['**/node_modules'],
onlyFiles: true,
expandDirectories: false,
})
).filter((relativePath) => {
});

let allFiles: string[];
if (options?.useGit) {
try {
allFiles = execSync('git ls-files --recurse-submodules', {
cwd: directory,
encoding: 'utf-8',
})
.split('\n')
.filter(Boolean);
} catch {
allFiles = await globFiles();
}
} else {
allFiles = await globFiles();
}

const files = allFiles.filter((relativePath) => {
return (
picomatchMultiple(relativePath, options?.include) ||
!picomatchMultiple(relativePath, options?.exclude)
Expand Down