@netlify/edge-bundler 9.4.1 → 9.5.0

package/dist/node/server/server.js

@@ -1,3 +1,5 @@
+import { readdir, unlink } from 'fs/promises';
+import { join } from 'path';
 import { DenoBridge } from '../bridge.js';
 import { getFunctionConfig } from '../config.js';
 import { generateStage2 } from '../formats/javascript.js';
@@ -6,7 +8,17 @@ import { getLogger } from '../logger.js';
 import { vendorNPMSpecifiers } from '../npm_dependencies.js';
 import { ensureLatestTypes } from '../types.js';
 import { killProcess, waitForServer } from './util.js';
-const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, featureFlags, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, }) => {
+/**
+ * Cleans up a directory, except for the files specified in the `except` array.
+ * Both should be given as absolute paths.
+ * Assumes the directory doesn't contain any nested directories.
+ */
+const cleanDirectory = async (directory, except) => {
+    const files = await readdir(directory);
+    const toBeDeleted = files.filter((file) => !except.includes(join(directory, file)));
+    await Promise.all(toBeDeleted.map((file) => unlink(join(directory, file))));
+};
+const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, }) => {
     const processRef = {};
     const startServer = async (functions, env = {}, options = {}) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
@@ -24,21 +36,23 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
         const features = {};
         const importMap = baseImportMap.clone();
         const npmSpecifiersWithExtraneousFiles = [];
-        if (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.edge_functions_npm_modules) {
-            const vendor = await vendorNPMSpecifiers({
-                basePath,
-                directory: distDirectory,
-                functions: functions.map(({ path }) => path),
-                importMap,
-                logger,
-                referenceTypes: true,
-            });
-            if (vendor) {
-                features.npmModules = true;
-                importMap.add(vendor.importMap);
-                npmSpecifiersWithExtraneousFiles.push(...vendor.npmSpecifiersWithExtraneousFiles);
-            }
+        // we keep track of the files that are relevant to the user's code, so we can clean up leftovers from past executions later
+        const relevantFiles = [stage2Path];
+        const vendor = await vendorNPMSpecifiers({
+            basePath,
+            directory: distDirectory,
+            functions: functions.map(({ path }) => path),
+            importMap,
+            logger,
+            referenceTypes: true,
+        });
+        if (vendor) {
+            features.npmModules = true;
+            importMap.add(vendor.importMap);
+            npmSpecifiersWithExtraneousFiles.push(...vendor.npmSpecifiersWithExtraneousFiles);
+            relevantFiles.push(...vendor.outputFiles);
         }
+        await cleanDirectory(distDirectory, relevantFiles);
         try {
             // This command will print a JSON object with all the modules found in
             // the `stage2Path` file as well as all of their dependencies.

package/dist/node/server/server.test.js

@@ -21,9 +21,6 @@ test('Starts a server and serves requests for edge functions', async () => {
         importMapPaths,
         port,
         servePath,
-        featureFlags: {
-            edge_functions_npm_modules: true,
-        },
     });
     const functions = [
         {

package/dist/test/util.js

@@ -55,7 +55,7 @@ const runESZIP = async (eszipPath, vendorDirectory) => {
     const extractCommand = execa('deno', [
         'run',
         '--allow-all',
-        'https://deno.land/x/eszip@v0.40.0/eszip.ts',
+        'https://deno.land/x/eszip@v0.55.2/eszip.ts',
         'x',
         eszipPath,
         tmpDir.path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",