@netlify/edge-bundler 14.5.0 → 14.5.2

package/dist/node/bundler.test.js

@@ -4,6 +4,7 @@ import { join, resolve } from 'path';
 import process from 'process';
 import { pathToFileURL } from 'url';
 import { gte, lt } from 'semver';
+import * as tar from 'tar';
 import tmp from 'tmp-promise';
 import { test, expect, vi, describe } from 'vitest';
 import { importMapSpecifier } from '../shared/consts.js';
@@ -608,6 +609,14 @@ describe.skipIf(lt(denoVersion, '2.4.2'))('Produces a tarball bundle', () => {
         const tarballPath = join(distPath, manifest.bundles[0].asset);
         const tarballResult = await runTarball(tarballPath);
         expect(tarballResult).toStrictEqual(expectedOutput);
+        const entries = [];
+        await tar.list({
+            file: tarballPath,
+            onReadEntry: (entry) => {
+                entries.push(entry.path);
+            },
+        });
+        expect(entries).toStrictEqual(['___netlify-edge-functions.json', 'deno.json', 'func1.js']);
         const eszipPath = join(distPath, manifest.bundles[1].asset);
         const eszipResult = await runESZIP(eszipPath);
         expect(eszipResult).toStrictEqual(expectedOutput);

package/dist/node/formats/tarball.js

@@ -4,12 +4,13 @@ import commonPathPrefix from 'common-path-prefix';
 import * as tar from 'tar';
 import tmp from 'tmp-promise';
 import { BundleFormat } from '../bundle.js';
-import { getDirectoryHash, getStringHash } from '../utils/sha256.js';
-const TARBALL_EXTENSION = '.tar';
+import { listRecursively } from '../utils/fs.js';
+import { getFileHash } from '../utils/sha256.js';
+const TARBALL_EXTENSION = '.tar.gz';
 const getUnixPath = (input) => input.split(path.sep).join('/');
 export const bundle = async ({ basePath, buildID, deno, distDirectory, functions, importMap, vendorDirectory, }) => {
-    const sideFilesDir = await tmp.dir({ unsafeCleanup: true });
-    const cleanup = [sideFilesDir.cleanup];
+    const bundleDir = await tmp.dir({ unsafeCleanup: true });
+    const cleanup = [bundleDir.cleanup];
     let denoDir = vendorDirectory ? path.join(vendorDirectory, 'deno_dir') : undefined;
     if (!denoDir) {
         const tmpDir = await tmp.dir({ unsafeCleanup: true });
@@ -43,50 +44,35 @@ export const bundle = async ({ basePath, buildID, deno, distDirectory, functions
         '--quiet',
         '--code-splitting',
         '--outdir',
-        distDirectory,
+        bundleDir.path,
         ...functions.map((func) => func.path),
     ], {
         cwd: basePath,
     });
-    const manifestPath = path.join(sideFilesDir.path, 'manifest.json');
+    const manifestPath = path.join(bundleDir.path, '___netlify-edge-functions.json');
     const manifestContents = JSON.stringify(manifest);
     await fs.writeFile(manifestPath, manifestContents);
-    const denoConfigPath = path.join(sideFilesDir.path, 'deno.json');
+    const denoConfigPath = path.join(bundleDir.path, 'deno.json');
     const denoConfigContents = JSON.stringify(importMap.getContentsWithRelativePaths());
     await fs.writeFile(denoConfigPath, denoConfigContents);
-    const rootLevel = await fs.readdir(distDirectory);
-    const hash = await getDirectoryHash(distDirectory);
     const tarballPath = path.join(distDirectory, buildID + TARBALL_EXTENSION);
     await fs.mkdir(path.dirname(tarballPath), { recursive: true });
-    // Adding all the bundled files.
     await tar.create({
-        cwd: distDirectory,
+        cwd: bundleDir.path,
         file: tarballPath,
+        gzip: true,
+        noDirRecurse: true,
         onWriteEntry(entry) {
-            entry.path = getUnixPath(`./${entry.path}`);
+            const relativePath = path.relative(bundleDir.path, path.join('/', entry.path));
+            const normalizedPath = getUnixPath(relativePath);
+            entry.path = normalizedPath;
         },
-    }, rootLevel);
-    // Adding `deno.json`.
-    await tar.update({
-        cwd: distDirectory,
-        file: tarballPath,
-        onWriteEntry(entry) {
-            entry.path = './deno.json';
-        },
-    }, [denoConfigPath]);
-    // Adding the manifest file.
-    await tar.update({
-        cwd: distDirectory,
-        file: tarballPath,
-        onWriteEntry(entry) {
-            entry.path = './___netlify-edge-functions.json';
-        },
-    }, [manifestPath]);
-    await Promise.all(cleanup);
-    const finalHash = [hash, getStringHash(manifestContents), getStringHash(denoConfigContents)].join('');
+    }, await listRecursively(bundleDir.path));
+    const hash = await getFileHash(tarballPath);
+    await Promise.allSettled(cleanup);
     return {
         extension: TARBALL_EXTENSION,
         format: BundleFormat.TARBALL,
-        hash: finalHash,
+        hash,
     };
 };

package/dist/node/utils/fs.d.ts

@@ -1,3 +1,4 @@
+export declare const listRecursively: (dirPath: string) => Promise<string[]>;
 /**
  * Returns all the directories obtained by traversing `inner` and its parents
  * all the way to `outer`, inclusive.

package/dist/node/utils/fs.js

@@ -1,4 +1,22 @@
-import path from 'path';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+export const listRecursively = async (dirPath) => {
+    const entries = [];
+    async function walk(currentPath) {
+        const dirents = await fs.readdir(currentPath, { withFileTypes: true });
+        for (const dirent of dirents) {
+            const fullPath = path.join(currentPath, dirent.name);
+            if (dirent.isDirectory()) {
+                await walk(fullPath);
+            }
+            else if (dirent.isFile() || dirent.isSymbolicLink()) {
+                entries.push(fullPath);
+            }
+        }
+    }
+    await walk(dirPath);
+    return entries.sort((a, b) => a.localeCompare(b));
+};
 /**
  * Returns all the directories obtained by traversing `inner` and its parents
  * all the way to `outer`, inclusive.

package/dist/node/utils/sha256.d.ts

@@ -1,3 +1,2 @@
-export declare const getDirectoryHash: (dirPath: string) => Promise<string>;
 export declare const getFileHash: (path: string) => Promise<string>;
 export declare const getStringHash: (input: string) => string;

package/dist/node/utils/sha256.js

@@ -1,25 +1,5 @@
 import crypto from 'node:crypto';
-import { createReadStream, promises as fs } from 'node:fs';
-import path from 'node:path';
-export const getDirectoryHash = async (dirPath) => {
-    const entries = [];
-    async function walk(currentPath) {
-        const dirents = await fs.readdir(currentPath, { withFileTypes: true });
-        for (const dirent of dirents) {
-            const fullPath = path.join(currentPath, dirent.name);
-            const relativePath = path.relative(dirPath, fullPath);
-            if (dirent.isDirectory()) {
-                await walk(fullPath);
-            }
-            else if (dirent.isFile() || dirent.isSymbolicLink()) {
-                const fileHash = await getFileHash(fullPath);
-                entries.push(`${relativePath}:${fileHash}`);
-            }
-        }
-    }
-    await walk(dirPath);
-    return getStringHash(entries.sort((a, b) => a.localeCompare(b)).join('\n'));
-};
+import { createReadStream } from 'node:fs';
 export const getFileHash = (path) => {
     const hash = crypto.createHash('sha256');
     hash.setEncoding('hex');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.5.0",
+  "version": "14.5.2",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -80,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "6c0a42f34965ccca2564cf7b3c5a4d458debbe50"
+  "gitHead": "e1251f7e7c36b6de4cf0d88777b9f362817520f3"
 }