@link-assistant/web-capture 1.10.10 → 1.10.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/web-capture
 
+## 1.10.12
+
+### Patch Changes
+
+- Auto-release unreleased changes
+
+## 1.10.11
+
+### Patch Changes
+
+- 611e6e7: Upgrade Archiver to version 8 so downstream installs no longer include the deprecated glob package.
+
 ## 1.10.10
 
 ### Patch Changes

package/bin/web-capture.js

@@ -549,15 +549,14 @@ async function writeGoogleDocsArchive({
   archiveFormat,
   prettyHtml,
 }) {
-  const { default: archiver } = await import('archiver');
+  const { ZipArchive } = await import('archiver');
   const { prettyPrintHtml } = await import('../src/lib.js');
   const output =
     explicitOutput === '-'
       ? null
       : explicitOutput ||
         deriveOutputPath(absoluteUrl, archiveExtension(archiveFormat), dataDir);
-  const archiverFn = archiver.default ? archiver.default : archiver;
-  const archive = archiverFn('zip', { zlib: { level: 9 } });
+  const archive = new ZipArchive({ zlib: { level: 9 } });
   archive.append(archiveResult.markdown, { name: 'document.md' });
   archive.append(
     prettyHtml ? prettyPrintHtml(archiveResult.html) : archiveResult.html,
@@ -835,7 +834,7 @@ async function captureUrl(url, options) {
       try {
         if (normalizedFormat === 'archive' || normalizedFormat === 'zip') {
           const { fetchGoogleDocAsArchive } = await import('../src/gdocs.js');
-          const { default: archiver } = await import('archiver');
+          const { ZipArchive } = await import('archiver');
           const archiveFormat = options.archiveFormat || 'zip';
           const ext =
             archiveFormat === 'tar.gz' || archiveFormat === 'gz'
@@ -855,9 +854,7 @@ async function captureUrl(url, options) {
               : explicitOutput || deriveOutputPath(absoluteUrl, ext, dataDir);
           if (output) {
             const outStream = fs.createWriteStream(output);
-            const archive = archiver.default
-              ? archiver.default('zip', { zlib: { level: 9 } })
-              : archiver('zip', { zlib: { level: 9 } });
+            const archive = new ZipArchive({ zlib: { level: 9 } });
             archive.pipe(outStream);
             const { prettyPrintHtml: ppHtml } = await import('../src/lib.js');
             archive.append(archiveResult.markdown, { name: 'document.md' });
@@ -876,10 +873,7 @@ async function captureUrl(url, options) {
           } else {
             const { PassThrough } = await import('stream');
             const passthrough = new PassThrough();
-            const archiverMod = await import('archiver');
-            const archiverFn =
-              archiverMod.default?.default || archiverMod.default;
-            const archive = archiverFn('zip', { zlib: { level: 9 } });
+            const archive = new ZipArchive({ zlib: { level: 9 } });
             archive.pipe(passthrough);
             passthrough.pipe(process.stdout);
             const { prettyPrintHtml: ppHtml2 } = await import('../src/lib.js');
@@ -1111,7 +1105,7 @@ async function captureUrl(url, options) {
       console.error(`DOCX saved to: ${outPath}`);
     } else if (normalizedFormat === 'archive' || normalizedFormat === 'zip') {
       // ZIP archive
-      const { default: archiver } = await import('archiver');
+      const { ZipArchive } = await import('archiver');
       const { fetchHtml, convertHtmlToMarkdown, convertRelativeUrls } =
         await import('../src/lib.js');
       const { retry } = await import('../src/retry.js');
@@ -1131,9 +1125,7 @@ async function captureUrl(url, options) {
         explicitOutput ||
         `${new URL(absoluteUrl).hostname.replace(/\./g, '-')}-archive.zip`;
       const outStream = fs.createWriteStream(outPath);
-      const archive = archiver.default
-        ? archiver.default('zip', { zlib: { level: 9 } })
-        : archiver('zip', { zlib: { level: 9 } });
+      const archive = new ZipArchive({ zlib: { level: 9 } });
       archive.pipe(outStream);
 
       // Collect images

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/web-capture",
-  "version": "1.10.10",
+  "version": "1.10.12",
   "description": "CLI and microservice to render web pages as HTML, Markdown, or PNG",
   "main": "src/index.js",
   "bin": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@kreuzberg/html-to-markdown-node": "^3.5.5",
-    "archiver": "^7.0.1",
+    "archiver": "^8.0.0",
     "browser-commander": "^0.8.0",
     "cheerio": "^1.0.0",
     "docx": "^9.6.1",

package/src/archive.js

@@ -15,7 +15,7 @@
  *   documentFormat - 'markdown' (default) or 'html' - format of the main document
  */
 
-import archiver from 'archiver';
+import { ZipArchive } from 'archiver';
 import fetch from 'node-fetch';
 import * as cheerio from 'cheerio';
 import { URL } from 'url';
@@ -88,7 +88,7 @@ export async function archiveHandler(req, res) {
       `attachment; filename="${hostname}-archive.zip"`
     );
 
-    const archive = archiver('zip', { zlib: { level: 9 } });
+    const archive = new ZipArchive({ zlib: { level: 9 } });
     archive.pipe(res);
 
     // Build the image map for local downloads
@@ -251,7 +251,7 @@ function appendMarkdownAndImages(archive, markdown) {
  * @returns {Promise<Buffer>} the finalized ZIP archive bytes
  */
 export async function buildArchiveFromHtml(html, baseUrl) {
-  const archive = archiver('zip', { zlib: { level: 9 } });
+  const archive = new ZipArchive({ zlib: { level: 9 } });
   const chunks = [];
   archive.on('data', (chunk) => chunks.push(chunk));
   const finished = new Promise((resolve, reject) => {

package/src/markdown.js

@@ -17,7 +17,7 @@ import { convertWithKreuzberg, isKreuzbergAvailable } from './kreuzberg.js';
 import { applyImageMode } from './extract-images.js';
 import { createBrowser, getBrowserEngine } from './browser.js';
 import { retry } from './retry.js';
-import archiver from 'archiver';
+import { ZipArchive } from 'archiver';
 import fetch from 'node-fetch';
 import * as cheerio from 'cheerio';
 
@@ -300,7 +300,7 @@ async function sendTextPasteMarkdownArchive(res, url, markdown, rawText) {
   res.setHeader('Content-Type', 'application/zip');
   res.setHeader('Content-Disposition', `attachment; filename="${pasteId}.zip"`);
 
-  const archive = archiver('zip', { zlib: { level: 9 } });
+  const archive = new ZipArchive({ zlib: { level: 9 } });
   archive.pipe(res);
   archive.append(
     [

package/tests/unit/package-runtime-dependencies.test.js

@@ -10,6 +10,25 @@ function readJson(relativePath) {
   return JSON.parse(readFileSync(resolve(jsRoot, relativePath), 'utf8'));
 }
 
+function collectProductionDependencies(packageLock, packageName) {
+  const visited = new Set();
+
+  function visit(name) {
+    if (visited.has(name)) {
+      return;
+    }
+    visited.add(name);
+
+    const entry = packageLock.packages[`node_modules/${name}`];
+    for (const dependency of Object.keys(entry?.dependencies || {})) {
+      visit(dependency);
+    }
+  }
+
+  visit(packageName);
+  return visited;
+}
+
 const runtimeImports = [
   {
     packageName: 'turndown-plugin-gfm',
@@ -18,6 +37,13 @@ const runtimeImports = [
 ];
 
 describe('runtime package dependencies', () => {
+  test('archiver production dependencies do not include deprecated glob', () => {
+    const packageLock = readJson('package-lock.json');
+    const dependencies = collectProductionDependencies(packageLock, 'archiver');
+
+    expect([...dependencies]).not.toContain('glob');
+  });
+
   test.each(runtimeImports)(
     '$packageName is declared as a production dependency',
     ({ packageName, sourceFile }) => {