Skip to content

Add archiver patches back to fix following symlinks on export #3060

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

Merged
wojtekn merged 5 commits into from
Apr 13, 2026
Merged

Add archiver patches back to fix following symlinks on export #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bde013e
Add archiver patches back to fix following symlinks on export
wojtekn Apr 10, 2026
0aac9af
Remove @types/archiver patches
epeicher Apr 10, 2026
77155d1
Remove @types/archiver patches and restore ArchiverOptions casts
epeicher Apr 10, 2026
fe1f002
Merge branch 'add-archiver-patches-back' of github.com:Automattic/stu…
epeicher Apr 10, 2026
1428970
Remove cast and explicitly silence TS error
wojtekn Apr 13, 2026
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
3 changes: 2 additions & 1 deletion apps/cli/lib/archive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ export async function archiveSiteContent(
const output = fs.createWriteStream( archivePath );
const archiveBuilder = archiver( 'zip', {
zlib: { level: ZIP_COMPRESSION_LEVEL },
// @ts-expect-error The `followSymlinks` option comes from a patch
followSymlinks: true,
} as archiver.ArchiverOptions );
} );

output.on( 'close', () => {
resolve( archiveBuilder );
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/lib/import-export/export/exporters/default-exporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
this.emit( ExportEvents.BACKUP_CREATE_START );
const isZip = this.options.backupFile.endsWith( '.zip' );
const format = isZip ? 'zip' : 'tar';
return archiver( format, ARCHIVER_OPTIONS[ format ] as archiver.ArchiverOptions );
return archiver( format, ARCHIVER_OPTIONS[ format ] );
}

private setupArchiveListeners( output: fs.WriteStream ): Promise< void > {
Expand Down
14 changes: 14 additions & 0 deletions apps/cli/patches/archiver+7.0.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/archiver/lib/core.js b/node_modules/archiver/lib/core.js
index 7c0a74d..2934fe5 100644
--- a/node_modules/archiver/lib/core.js
+++ b/node_modules/archiver/lib/core.js
@@ -631,7 +631,8 @@

var globOptions = {
stat: true,
- dot: true
+ dot: true,
+ follow: this.options.followSymlinks
};

function onGlobEnd() {
14 changes: 14 additions & 0 deletions apps/studio/patches/archiver+7.0.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/archiver/lib/core.js b/node_modules/archiver/lib/core.js
index 7c0a74d..2934fe5 100644
--- a/node_modules/archiver/lib/core.js
+++ b/node_modules/archiver/lib/core.js
@@ -631,7 +631,8 @@

var globOptions = {
stat: true,
- dot: true
+ dot: true,
+ follow: this.options.followSymlinks
};

function onGlobEnd() {
2 changes: 1 addition & 1 deletion apps/studio/src/lib/import-export/export/exporters/default-exporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
this.emit( ExportEvents.BACKUP_CREATE_START );
const isZip = this.options.backupFile.endsWith( '.zip' );
const format = isZip ? 'zip' : 'tar';
return archiver( format, ARCHIVER_OPTIONS[ format ] as archiver.ArchiverOptions );
return archiver( format, ARCHIVER_OPTIONS[ format ] );
}

private setupArchiveListeners( output: fs.WriteStream ): Promise< void > {
Expand Down
Loading