@netlify/build 29.29.3 → 29.30.0

package/lib/plugins_core/functions/index.d.ts

@@ -44,7 +44,7 @@ export declare const bundleFunctions: {
     }) => Promise<boolean>;
 };
 export declare const zipItAndShipIt: {
-    zipFunctions(args_0: string | string[], args_1: string, args_2?: import("@netlify/zip-it-and-ship-it").ZipFunctionsOptions | undefined): Promise<(Omit<import("@netlify/zip-it-and-ship-it/dist/function.js").FunctionArchive, "runtime"> & {
+    zipFunctions(relativeSrcFolders: string | string[], destFolder: string, args_2?: import("@netlify/zip-it-and-ship-it").ZipFunctionsOptions | undefined): Promise<(Omit<import("@netlify/zip-it-and-ship-it/dist/function.js").FunctionArchive, "runtime"> & {
         routes?: import("@netlify/zip-it-and-ship-it/dist/utils/routes.js").Route[] | undefined;
         runtime: import("@netlify/zip-it-and-ship-it").RuntimeName;
         schedule?: string | undefined;

package/lib/plugins_core/pre_dev_cleanup/index.d.ts

@@ -0,0 +1,14 @@
+import type { NetlifyPluginOptions } from '../../index.js';
+type Input = NetlifyPluginOptions & {
+    buildDir: string;
+    logs: any;
+};
+export declare const preDevCleanup: {
+    event: string;
+    coreStep: (input: Input) => Promise<{}>;
+    coreStepId: string;
+    coreStepName: string;
+    coreStepDescription: () => string;
+    condition: (input: Input) => Promise<boolean>;
+};
+export {};

package/lib/plugins_core/pre_dev_cleanup/index.js

@@ -0,0 +1,42 @@
+import { rm, stat } from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { log } from '../../log/logger.js';
+const dirExists = async function (path) {
+    try {
+        await stat(path);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+};
+const getDirtyDirs = async function ({ buildDir, constants: { INTERNAL_EDGE_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC }, }) {
+    const dirs = [];
+    if (INTERNAL_FUNCTIONS_SRC && (await dirExists(resolve(buildDir, INTERNAL_FUNCTIONS_SRC)))) {
+        dirs.push(INTERNAL_FUNCTIONS_SRC);
+    }
+    if (INTERNAL_EDGE_FUNCTIONS_SRC && (await dirExists(resolve(buildDir, INTERNAL_EDGE_FUNCTIONS_SRC)))) {
+        dirs.push(INTERNAL_EDGE_FUNCTIONS_SRC);
+    }
+    return dirs;
+};
+const condition = async (input) => {
+    const dirs = await getDirtyDirs(input);
+    return dirs.length > 0;
+};
+const coreStep = async (input) => {
+    const dirs = await getDirtyDirs(input);
+    for (const dir of dirs) {
+        await rm(resolve(input.buildDir, dir), { recursive: true, force: true });
+    }
+    log(input.logs, `Cleaned up ${dirs.join(', ')}.`);
+    return {};
+};
+export const preDevCleanup = {
+    event: 'onPreDev',
+    coreStep,
+    coreStepId: 'pre_dev_cleanup',
+    coreStepName: 'Pre Dev cleanup',
+    coreStepDescription: () => 'Cleaning up leftover files from previous builds',
+    condition,
+};

package/lib/steps/get.js

@@ -6,6 +6,7 @@ import { deploySite } from '../plugins_core/deploy/index.js';
 import { bundleEdgeFunctions } from '../plugins_core/edge_functions/index.js';
 import { bundleFunctions } from '../plugins_core/functions/index.js';
 import { preCleanup } from '../plugins_core/pre_cleanup/index.js';
+import { preDevCleanup } from '../plugins_core/pre_dev_cleanup/index.js';
 import { saveArtifacts } from '../plugins_core/save_artifacts/index.js';
 import { scanForSecrets } from '../plugins_core/secrets_scanning/index.js';
 // Get all build steps
@@ -30,7 +31,7 @@ export const getDevSteps = function (command, steps, eventHandlers) {
         coreStepDescription: () => 'Run command for local development',
     };
     const eventSteps = getEventSteps(eventHandlers);
-    const sortedSteps = sortSteps([...steps, eventSteps, devCommandStep], DEV_EVENTS);
+    const sortedSteps = sortSteps([...steps, eventSteps, preDevCleanup, devCommandStep], DEV_EVENTS);
     const events = getEvents(sortedSteps);
     return { steps: sortedSteps, events };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.29.3",
+  "version": "29.30.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -71,11 +71,11 @@
     "@netlify/config": "^20.10.0",
     "@netlify/edge-bundler": "10.1.3",
     "@netlify/framework-info": "^9.8.10",
-    "@netlify/functions-utils": "^5.2.44",
+    "@netlify/functions-utils": "^5.2.45",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/plugins-list": "^6.72.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.28.0",
+    "@netlify/zip-it-and-ship-it": "9.28.1",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/core": "^1.17.1",
     "@sindresorhus/slugify": "^2.0.0",
@@ -157,5 +157,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "700797f1b9754eecae6a0379455e85434ef88ad5"
+  "gitHead": "b32d2b2d81b062d5021fa0c91d831b23353a5b1d"
 }