@netlify/build 35.10.1 → 35.11.0

package/lib/log/messages/core_steps.d.ts

@@ -14,6 +14,16 @@ export function logFunctionsToBundle({ logs, userFunctions, userFunctionsSrc, us
     generatedFunctions: any;
     type?: string | undefined;
 }): void;
+export function logDbProvisioning({ logs, branch, context }: {
+    logs: any;
+    branch: any;
+    context: any;
+}): void;
+export function logDbMigrations({ logs, migrations, srcDir }: {
+    logs: any;
+    migrations: any;
+    srcDir: any;
+}): void;
 export function logSecretsScanSkipMessage(logs: any, msg: any): void;
 export function logSecretsScanSuccessMessage(logs: any, msg: any): void;
 export function logSecretsScanFailBuildMessage({ logs, scanResults, groupedResults, enhancedScanShouldRunInActiveMode, }: {

package/lib/log/messages/core_steps.js

@@ -90,6 +90,22 @@ export const logFunctionsToBundle = function ({ logs, userFunctions, userFunctio
     log(logs, `Packaging ${type} from ${THEME.highlightWords(userFunctionsSrc)} directory:`);
     logArray(logs, userFunctions, { indent: false });
 };
+// Print the database provisioning message
+export const logDbProvisioning = function ({ logs, branch, context }) {
+    log(logs, `Provisioning database`);
+    if (context !== 'production') {
+        log(logs, `Creating database branch for ${THEME.highlightWords(branch)}`);
+    }
+};
+// Print the list of database migrations about to be copied
+export const logDbMigrations = function ({ logs, migrations, srcDir }) {
+    if (migrations.length === 0) {
+        log(logs, `No migrations found in ${THEME.highlightWords(srcDir)} directory`);
+        return;
+    }
+    log(logs, `Loading migrations from ${THEME.highlightWords(srcDir)} directory:`);
+    logArray(logs, migrations, { indent: false });
+};
 const logModulesWithDynamicImports = ({ logs, modulesWithDynamicImports }) => {
     const externalNodeModules = modulesWithDynamicImports.map((moduleName) => `"${moduleName}"`).join(', ');
     logWarningSubHeader(logs, `The following Node.js modules use dynamic expressions to include files:`);

package/lib/plugins_core/db_setup/index.js

@@ -1,5 +1,7 @@
 import { join } from 'node:path';
+import { logDbProvisioning, logDbMigrations } from '../../log/messages/core_steps.js';
 import { getPackageJson } from '../../utils/package.js';
+import { readMigrationEntries, getMigrationNames } from './utils.js';
 const NPM_PACKAGE_NAME = '@netlify/db';
 const condition = async ({ buildDir, packagePath, featureFlags }) => {
     if (!featureFlags?.netlify_build_db_setup) {
@@ -17,8 +19,14 @@ const condition = async ({ buildDir, packagePath, featureFlags }) => {
     }
     return false;
 };
-const coreStep = async ({ api, branch, constants, context }) => {
+const coreStep = async ({ api, branch, buildDir, constants, context, logs }) => {
     const siteId = constants.SITE_ID;
+    logDbProvisioning({ logs, branch, context });
+    const entries = await readMigrationEntries(buildDir, constants.DB_MIGRATIONS_SRC);
+    const migrationNames = getMigrationNames(entries);
+    if (migrationNames.length > 0) {
+        logDbMigrations({ logs, migrations: migrationNames, srcDir: constants.DB_MIGRATIONS_SRC });
+    }
     // @ts-expect-error This is an internal method for now so it isn't typed yet.
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     const database = (await api.createSiteDatabase({ site_id: siteId }));
@@ -44,6 +52,6 @@ export const dbSetup = {
     coreStep,
     coreStepId: 'db_provision',
     coreStepName: 'Netlify DB setup',
-    coreStepDescription: () => 'Setup Netlify DB database',
+    coreStepDescription: () => 'Netlify DB setup',
     condition,
 };

package/lib/plugins_core/db_setup/migrations.js

@@ -1,6 +1,7 @@
-import { copyFile, mkdir, readdir, stat } from 'node:fs/promises';
+import { copyFile, mkdir } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { pathExists } from 'path-exists';
+import { readMigrationEntries } from './utils.js';
 import { validateMigrations, formatValidationErrors } from './validation.js';
 const condition = async ({ featureFlags, constants, buildDir }) => {
     if (!featureFlags?.netlify_build_db_setup) {
@@ -15,18 +16,7 @@ const condition = async ({ featureFlags, constants, buildDir }) => {
 const coreStep = async ({ constants, buildDir, systemLog }) => {
     const srcDir = resolve(buildDir, constants.DB_MIGRATIONS_SRC);
     const destDir = resolve(buildDir, constants.DB_MIGRATIONS_DIST);
-    const entries = await readdir(srcDir);
-    const dirNames = [];
-    const fileNames = [];
-    for (const entry of entries) {
-        const entryStat = await stat(join(srcDir, entry));
-        if (entryStat.isDirectory()) {
-            dirNames.push(entry);
-        }
-        else if (entry.endsWith('.sql')) {
-            fileNames.push(entry);
-        }
-    }
+    const { dirNames, fileNames } = await readMigrationEntries(buildDir, constants.DB_MIGRATIONS_SRC);
     if (dirNames.length === 0 && fileNames.length === 0) {
         systemLog('No migration directories found, skipping copy.');
         return {};
@@ -65,4 +55,5 @@ export const copyDbMigrations = {
     coreStepName: 'Netlify DB migrations',
     coreStepDescription: () => 'Copy database migrations to internal directory',
     condition,
+    quiet: true,
 };

package/lib/plugins_core/db_setup/utils.d.ts

@@ -0,0 +1,6 @@
+export interface MigrationEntries {
+    dirNames: string[];
+    fileNames: string[];
+}
+export declare const readMigrationEntries: (buildDir: string, migrationsSrc?: string) => Promise<MigrationEntries>;
+export declare const getMigrationNames: ({ dirNames, fileNames }: MigrationEntries) => string[];

package/lib/plugins_core/db_setup/utils.js

@@ -0,0 +1,30 @@
+import { readdir, stat } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+import { pathExists } from 'path-exists';
+export const readMigrationEntries = async (buildDir, migrationsSrc) => {
+    const empty = { dirNames: [], fileNames: [] };
+    if (!migrationsSrc) {
+        return empty;
+    }
+    const srcDir = resolve(buildDir, migrationsSrc);
+    if (!(await pathExists(srcDir))) {
+        return empty;
+    }
+    const entries = await readdir(srcDir);
+    const dirNames = [];
+    const fileNames = [];
+    for (const entry of entries) {
+        const entryStat = await stat(join(srcDir, entry));
+        if (entryStat.isDirectory()) {
+            dirNames.push(entry);
+        }
+        else if (entry.endsWith('.sql')) {
+            fileNames.push(entry);
+        }
+    }
+    return { dirNames, fileNames };
+};
+export const getMigrationNames = ({ dirNames, fileNames }) => [
+    ...dirNames,
+    ...fileNames.map((f) => f.replace(/\.sql$/, '')),
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "35.10.1",
+  "version": "35.11.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,7 +70,7 @@
     "@netlify/blobs": "^10.4.4",
     "@netlify/cache-utils": "^6.0.5",
     "@netlify/config": "^24.4.4",
-    "@netlify/edge-bundler": "14.9.18",
+    "@netlify/edge-bundler": "14.9.19",
     "@netlify/functions-utils": "^6.2.27",
     "@netlify/git-utils": "^6.0.4",
     "@netlify/opentelemetry-utils": "^2.0.2",
@@ -152,5 +152,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "d215694819e87e39ff42e863ed05124f5fd3da98"
+  "gitHead": "3694352be4959c56e96a6c15dd04ed4d7aa31344"
 }