@netlify/build 35.11.2 → 35.13.0

package/lib/core/constants.d.ts

@@ -48,7 +48,7 @@ export interface NetlifyPluginConstants {
     EDGE_FUNCTIONS_SRC?: string;
     /**
      * the directory where database migration source files live.
-     * `undefined` if no `netlify/db/migrations` directory exists and if not specified by the user.
+     * `undefined` if no `netlify/database/migrations` directory exists and if not specified by the user.
      */
     DB_MIGRATIONS_SRC?: string;
     /**
@@ -100,7 +100,7 @@ export declare const getConstants: ({ configPath, buildDir, packagePath, functio
     token: any;
     mode: any;
 }) => Promise<NetlifyPluginConstants>;
-export declare const addMutableConstants: ({ constants, buildDir, netlifyConfig: { build: { publish, edge_functions: edgeFunctions }, functionsDirectory, db, }, }: {
+export declare const addMutableConstants: ({ constants, buildDir, netlifyConfig: { build: { publish, edge_functions: edgeFunctions }, functionsDirectory, database, }, }: {
     constants: any;
     buildDir: any;
     netlifyConfig: {
@@ -109,7 +109,7 @@ export declare const addMutableConstants: ({ constants, buildDir, netlifyConfig:
             edge_functions: any;
         };
         functionsDirectory: any;
-        db: any;
+        database: any;
     };
 }) => Promise<{
     [k: string]: string | boolean | undefined;

package/lib/core/constants.js

@@ -52,7 +52,7 @@ const DB_MIGRATIONS_DIST = '.netlify/internal/db/migrations';
 // Retrieve constants which might change during the build if a plugin modifies
 // `netlifyConfig` or creates some default directories.
 // Unlike readonly constants, this is called again before each build step.
-export const addMutableConstants = async function ({ constants, buildDir, netlifyConfig: { build: { publish, edge_functions: edgeFunctions }, functionsDirectory, db, }, }) {
+export const addMutableConstants = async function ({ constants, buildDir, netlifyConfig: { build: { publish, edge_functions: edgeFunctions }, functionsDirectory, database, }, }) {
     const constantsA = {
         ...constants,
         // Directory that contains the deploy-ready HTML files and assets generated by the build
@@ -62,7 +62,7 @@ export const addMutableConstants = async function ({ constants, buildDir, netlif
         // The directory where Edge Functions source code lives
         EDGE_FUNCTIONS_SRC: edgeFunctions,
         // The directory where database migration source files live
-        DB_MIGRATIONS_SRC: db?.migrations?.path,
+        DB_MIGRATIONS_SRC: database?.migrations?.path,
     };
     const constantsB = await addDefaultConstants(constantsA, buildDir);
     const constantsC = normalizeConstantsPaths(constantsB, buildDir);
@@ -84,7 +84,7 @@ const DEFAULT_PATHS = [
     { constantName: 'FUNCTIONS_SRC', defaultPath: 'netlify-automatic-functions' },
     { constantName: 'FUNCTIONS_SRC', defaultPath: 'netlify/functions' },
     { constantName: 'EDGE_FUNCTIONS_SRC', defaultPath: 'netlify/edge-functions' },
-    { constantName: 'DB_MIGRATIONS_SRC', defaultPath: 'netlify/db/migrations' },
+    { constantName: 'DB_MIGRATIONS_SRC', defaultPath: 'netlify/database/migrations' },
 ];
 const addDefaultConstant = async function ({ constants, constantName, defaultPath, buildDir }) {
     // Configuration paths are relative to the build directory.

package/lib/plugins_core/db_setup/index.js

@@ -1,8 +1,10 @@
 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';
+import { readMigrationEntries, getMigrationNames, getMigrationsSrc } from './utils.js';
+const NPM_PACKAGE_NAME = '@netlify/database';
+// TODO: Remove once we stop supporting the legacy `@netlify/db` package name.
+const NPM_PACKAGE_NAME_LEGACY = '@netlify/db';
 const condition = async ({ buildDir, packagePath, featureFlags }) => {
     if (!featureFlags?.netlify_build_db_setup) {
         return false;
@@ -22,10 +24,11 @@ const condition = async ({ buildDir, packagePath, featureFlags }) => {
 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 migrationsSrc = await getMigrationsSrc(buildDir, constants.DB_MIGRATIONS_SRC);
+    const entries = await readMigrationEntries(buildDir, migrationsSrc);
     const migrationNames = getMigrationNames(entries);
-    if (migrationNames.length > 0) {
-        logDbMigrations({ logs, migrations: migrationNames, srcDir: constants.DB_MIGRATIONS_SRC });
+    if (migrationNames.length > 0 && migrationsSrc) {
+        logDbMigrations({ logs, migrations: migrationNames, srcDir: migrationsSrc });
     }
     // @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
@@ -45,13 +48,16 @@ const coreStep = async ({ api, branch, buildDir, constants, context, logs }) =>
 };
 const hasDBPackage = (packageJSON) => {
     const { dependencies = {}, devDependencies = {} } = packageJSON;
-    return NPM_PACKAGE_NAME in dependencies || NPM_PACKAGE_NAME in devDependencies;
+    return (NPM_PACKAGE_NAME in dependencies ||
+        NPM_PACKAGE_NAME in devDependencies ||
+        NPM_PACKAGE_NAME_LEGACY in dependencies ||
+        NPM_PACKAGE_NAME_LEGACY in devDependencies);
 };
 export const dbSetup = {
     event: 'onPreBuild',
     coreStep,
     coreStepId: 'db_provision',
-    coreStepName: 'Netlify DB setup',
-    coreStepDescription: () => 'Netlify DB setup',
+    coreStepName: 'Netlify Database setup',
+    coreStepDescription: () => 'Netlify Database setup',
     condition,
 };

package/lib/plugins_core/db_setup/migrations.js

@@ -1,22 +1,23 @@
 import { copyFile, mkdir } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { pathExists } from 'path-exists';
-import { readMigrationEntries } from './utils.js';
+import { readMigrationEntries, getMigrationsSrc } from './utils.js';
 import { validateMigrations, formatValidationErrors } from './validation.js';
 const condition = async ({ featureFlags, constants, buildDir }) => {
     if (!featureFlags?.netlify_build_db_setup) {
         return false;
     }
-    const srcDir = constants.DB_MIGRATIONS_SRC;
+    const srcDir = await getMigrationsSrc(buildDir, constants.DB_MIGRATIONS_SRC);
     if (!srcDir) {
         return false;
     }
     return pathExists(resolve(buildDir, srcDir));
 };
 const coreStep = async ({ constants, buildDir, systemLog }) => {
-    const srcDir = resolve(buildDir, constants.DB_MIGRATIONS_SRC);
+    const migrationsSrc = await getMigrationsSrc(buildDir, constants.DB_MIGRATIONS_SRC);
+    const srcDir = resolve(buildDir, migrationsSrc);
     const destDir = resolve(buildDir, constants.DB_MIGRATIONS_DIST);
-    const { dirNames, fileNames } = await readMigrationEntries(buildDir, constants.DB_MIGRATIONS_SRC);
+    const { dirNames, fileNames } = await readMigrationEntries(buildDir, migrationsSrc);
     if (dirNames.length === 0 && fileNames.length === 0) {
         systemLog('No migration directories found, skipping copy.');
         return {};
@@ -52,7 +53,7 @@ export const copyDbMigrations = {
     event: 'onBuild',
     coreStep,
     coreStepId: 'db_migrations_copy',
-    coreStepName: 'Netlify DB migrations',
+    coreStepName: 'Netlify Database migrations',
     coreStepDescription: () => 'Copy database migrations to internal directory',
     condition,
     quiet: true,

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

@@ -1,3 +1,13 @@
+/**
+ * Returns the effective migrations source directory for the current build.
+ *
+ * If the user has set `database.migrations.path` in their config, or the new
+ * default `netlify/database/migrations` directory exists, that value will have
+ * been populated into `constants.DB_MIGRATIONS_SRC` upstream. If not, we fall
+ * back to the legacy `netlify/db/migrations` directory for backwards
+ * compatibility.
+ */
+export declare const getMigrationsSrc: (buildDir: string, configuredSrc: string | undefined) => Promise<string | undefined>;
 export interface MigrationEntries {
     dirNames: string[];
     fileNames: string[];

package/lib/plugins_core/db_setup/utils.js

@@ -1,6 +1,27 @@
 import { readdir, stat } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { pathExists } from 'path-exists';
+// TODO: Remove once we drop support for the legacy `netlify/db/migrations` directory.
+const LEGACY_DB_MIGRATIONS_SRC = 'netlify/db/migrations';
+/**
+ * Returns the effective migrations source directory for the current build.
+ *
+ * If the user has set `database.migrations.path` in their config, or the new
+ * default `netlify/database/migrations` directory exists, that value will have
+ * been populated into `constants.DB_MIGRATIONS_SRC` upstream. If not, we fall
+ * back to the legacy `netlify/db/migrations` directory for backwards
+ * compatibility.
+ */
+// TODO: Remove the legacy fallback once we drop support for `netlify/db/migrations`.
+export const getMigrationsSrc = async (buildDir, configuredSrc) => {
+    if (configuredSrc) {
+        return configuredSrc;
+    }
+    if (await pathExists(resolve(buildDir, LEGACY_DB_MIGRATIONS_SRC))) {
+        return LEGACY_DB_MIGRATIONS_SRC;
+    }
+    return undefined;
+};
 export const readMigrationEntries = async (buildDir, migrationsSrc) => {
     const empty = { dirNames: [], fileNames: [] };
     if (!migrationsSrc) {

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

@@ -1,9 +1,15 @@
 export declare const MIGRATION_DIR_PATTERN: RegExp;
 export declare const MIGRATION_FILE_PATTERN: RegExp;
-interface ValidationError {
+interface MissingSqlFileError {
     type: 'missing_sql_file';
     dirName: string;
 }
+interface DuplicateMigrationNumberError {
+    type: 'duplicate_migration_number';
+    migrationNumber: string;
+    names: string[];
+}
+type ValidationError = MissingSqlFileError | DuplicateMigrationNumberError;
 interface ValidationResult {
     valid: true;
     dirs: string[];
@@ -13,6 +19,7 @@ interface ValidationFailure {
     valid: false;
     errors: ValidationError[];
 }
+export declare const trackMigrationNumber: (numberToNames: Map<string, string[]>, name: string) => void;
 export declare const validateMigrations: (dirNames: string[], fileNames: string[], existingSqlFiles: Set<string>) => ValidationResult | ValidationFailure;
 export declare const formatValidationErrors: (errors: ValidationError[]) => string;
 export {};

package/lib/plugins_core/db_setup/validation.js

@@ -1,35 +1,56 @@
 export const MIGRATION_DIR_PATTERN = /^\d+_[a-z0-9_-]+$/;
 export const MIGRATION_FILE_PATTERN = /^\d+_[a-z0-9_-]+\.sql$/;
+export const trackMigrationNumber = (numberToNames, name) => {
+    const key = /^(\d+)_/.exec(name)[1].replace(/^0+/, '') || '0';
+    const existing = numberToNames.get(key);
+    if (existing) {
+        existing.push(name);
+    }
+    else {
+        numberToNames.set(key, [name]);
+    }
+};
 export const validateMigrations = (dirNames, fileNames, existingSqlFiles) => {
     const errors = [];
     const matchingDirs = [];
+    const numberToNames = new Map();
     for (const dirName of dirNames) {
         if (!MIGRATION_DIR_PATTERN.test(dirName)) {
             continue;
         }
         matchingDirs.push(dirName);
+        trackMigrationNumber(numberToNames, dirName);
         if (!existingSqlFiles.has(dirName)) {
             errors.push({ type: 'missing_sql_file', dirName });
         }
     }
-    if (errors.length > 0) {
-        return { valid: false, errors };
-    }
     const matchingFiles = [];
     for (const fileName of fileNames) {
         if (MIGRATION_FILE_PATTERN.test(fileName)) {
             matchingFiles.push(fileName);
+            trackMigrationNumber(numberToNames, fileName);
         }
     }
+    for (const [migrationNumber, names] of numberToNames) {
+        if (names.length > 1) {
+            errors.push({ type: 'duplicate_migration_number', migrationNumber, names: names.sort() });
+        }
+    }
+    if (errors.length > 0) {
+        return { valid: false, errors };
+    }
     return {
         valid: true,
-        dirs: [...matchingDirs].sort(),
-        files: [...matchingFiles].sort(),
+        dirs: matchingDirs.sort(),
+        files: matchingFiles.sort(),
     };
 };
 export const formatValidationErrors = (errors) => {
     const lines = errors.map((error) => {
-        return `  - "${error.dirName}/migration.sql" is missing.`;
+        if (error.type === 'missing_sql_file') {
+            return `  - "${error.dirName}/migration.sql" is missing.`;
+        }
+        return `  - Duplicate migration number ${error.migrationNumber}: ${error.names.map((n) => `"${n}"`).join(', ')}`;
     });
     return `Database migration validation failed:\n${lines.join('\n')}`;
 };

package/lib/plugins_core/db_setup/validation.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { MIGRATION_DIR_PATTERN, MIGRATION_FILE_PATTERN, validateMigrations, formatValidationErrors, } from './validation.js';
+import { MIGRATION_DIR_PATTERN, MIGRATION_FILE_PATTERN, trackMigrationNumber, validateMigrations, formatValidationErrors, } from './validation.js';
 describe('MIGRATION_DIR_PATTERN', () => {
     const validNames = [
         '1700000000_create-users',
@@ -55,6 +55,29 @@ describe('MIGRATION_FILE_PATTERN', () => {
         expect(MIGRATION_FILE_PATTERN.test(name)).toBe(false);
     });
 });
+describe('trackMigrationNumber', () => {
+    const cases = [
+        { name: '001_create-users', expected: '1' },
+        { name: '1_init', expected: '1' },
+        { name: '0001_add-posts', expected: '1' },
+        { name: '42_z', expected: '42' },
+        { name: '1700000000_create-users', expected: '1700000000' },
+        { name: '1700000000_create-users.sql', expected: '1700000000' },
+        { name: '001_create-users.sql', expected: '1' },
+        { name: '0000000000_init', expected: '0' },
+    ];
+    test.each(cases)('tracks $name under key $expected', ({ name, expected }) => {
+        const map = new Map();
+        trackMigrationNumber(map, name);
+        expect(map.get(expected)).toEqual([name]);
+    });
+    test('groups names with the same migration number', () => {
+        const map = new Map();
+        trackMigrationNumber(map, '001_create-users');
+        trackMigrationNumber(map, '1_init');
+        expect(map.get('1')).toEqual(['001_create-users', '1_init']);
+    });
+});
 describe('validateMigrations', () => {
     test('returns valid result with sorted dirs when all dirs are valid', () => {
         const dirNames = ['1700000001_add-posts', '1700000000_create-users'];
@@ -132,6 +155,52 @@ describe('validateMigrations', () => {
             files: [],
         });
     });
+    test('returns error for duplicate migration numbers in dirs', () => {
+        const dirNames = ['001_create-users', '001_add-posts'];
+        const existingSqlFiles = new Set(['001_create-users', '001_add-posts']);
+        const result = validateMigrations(dirNames, [], existingSqlFiles);
+        expect(result).toEqual({
+            valid: false,
+            errors: [
+                { type: 'duplicate_migration_number', migrationNumber: '1', names: ['001_add-posts', '001_create-users'] },
+            ],
+        });
+    });
+    test('returns error for duplicate migration numbers in files', () => {
+        const fileNames = ['001_create-users.sql', '001_add-posts.sql'];
+        const result = validateMigrations([], fileNames, new Set());
+        expect(result).toEqual({
+            valid: false,
+            errors: [
+                {
+                    type: 'duplicate_migration_number',
+                    migrationNumber: '1',
+                    names: ['001_add-posts.sql', '001_create-users.sql'],
+                },
+            ],
+        });
+    });
+    test('returns error for duplicate migration numbers across dirs and files', () => {
+        const dirNames = ['001_create-users'];
+        const fileNames = ['001_add-posts.sql'];
+        const existingSqlFiles = new Set(['001_create-users']);
+        const result = validateMigrations(dirNames, fileNames, existingSqlFiles);
+        expect(result).toEqual({
+            valid: false,
+            errors: [
+                { type: 'duplicate_migration_number', migrationNumber: '1', names: ['001_add-posts.sql', '001_create-users'] },
+            ],
+        });
+    });
+    test('treats different zero-padded prefixes as duplicates', () => {
+        const dirNames = ['1_init', '001_setup'];
+        const existingSqlFiles = new Set(['1_init', '001_setup']);
+        const result = validateMigrations(dirNames, [], existingSqlFiles);
+        expect(result).toEqual({
+            valid: false,
+            errors: [{ type: 'duplicate_migration_number', migrationNumber: '1', names: ['001_setup', '1_init'] }],
+        });
+    });
 });
 describe('formatValidationErrors', () => {
     test('formats missing_sql_file errors', () => {
@@ -147,4 +216,11 @@ describe('formatValidationErrors', () => {
         expect(message).toContain('"1700000000_create-users/migration.sql" is missing');
         expect(message).toContain('"1700000001_add-posts/migration.sql" is missing');
     });
+    test('formats duplicate_migration_number errors', () => {
+        const message = formatValidationErrors([
+            { type: 'duplicate_migration_number', migrationNumber: '1', names: ['001_add-posts', '001_create-users'] },
+        ]);
+        expect(message).toContain('Database migration validation failed');
+        expect(message).toContain('Duplicate migration number 1: "001_add-posts", "001_create-users"');
+    });
 });

package/lib/plugins_core/secrets_scanning/utils.js

@@ -1,6 +1,7 @@
 import { createReadStream, promises as fs, existsSync } from 'node:fs';
 import path from 'node:path';
 import { fdir } from 'fdir';
+import ignore from 'ignore';
 import { minimatch } from 'minimatch';
 import { LIKELY_SECRET_PREFIXES, SAFE_LISTED_VALUES } from './secret_prefixes.js';
 /**
@@ -170,21 +171,16 @@ export function findLikelySecrets({ text, omitValuesFromEnhancedScan = [], }) {
  */
 export async function getFilePathsToScan({ env, base }) {
     const omitPathsAlways = ['.git/', '.cache/'];
-    // node modules is dense and is only useful to scan if the repo itself commits these
-    // files. As a simple check to understand if the repo would commit these files, we expect
-    // that they would not ignore them from their git settings. So if gitignore includes
-    // node_modules anywhere we will omit looking in those folders - this will allow repos
-    // that do commit node_modules to still scan them.
-    let ignoreNodeModules = false;
+    // Files/folders ignored by the repo's .gitignore should not be scanned, since they
+    // are not committed to the repo and are not part of the build output the user controls.
+    // This also naturally excludes things like node_modules when the repo gitignores it.
     const gitignorePath = path.resolve(base, '.gitignore');
     const gitignoreContents = existsSync(gitignorePath) ? await fs.readFile(gitignorePath, 'utf-8') : '';
-    if (gitignoreContents?.includes('node_modules')) {
-        ignoreNodeModules = true;
-    }
+    const gitIgnoreFilter = gitignoreContents ? ignore().add(gitignoreContents) : null;
     let files = await new fdir()
         .withRelativePaths()
-        .filter((path) => {
-        if (ignoreNodeModules && path.includes('node_modules')) {
+        .filter((filePath) => {
+        if (gitIgnoreFilter && filePath && gitIgnoreFilter.ignores(filePath)) {
             return false;
         }
         return true;

package/lib/types/config/netlify_config.d.ts

@@ -25,11 +25,11 @@ interface NetlifyPlugin {
     package: string;
     inputs: PluginInputs;
 }
-interface DbMigrationsConfig {
+interface DatabaseMigrationsConfig {
     path?: string;
 }
-interface DbConfig {
-    migrations?: DbMigrationsConfig;
+interface DatabaseConfig {
+    migrations?: DatabaseMigrationsConfig;
 }
 interface ImagesConfig {
     remote_images: string[];
@@ -60,6 +60,6 @@ export interface NetlifyConfig {
     /**
      * object with options for database configuration
      */
-    db?: DbConfig;
+    database?: DatabaseConfig;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "35.11.2",
+  "version": "35.13.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,7 +69,7 @@
     "@bugsnag/js": "^8.0.0",
     "@netlify/blobs": "^10.4.4",
     "@netlify/cache-utils": "^6.0.5",
-    "@netlify/config": "^24.4.4",
+    "@netlify/config": "^24.5.0",
     "@netlify/edge-bundler": "14.9.19",
     "@netlify/functions-utils": "^6.2.29",
     "@netlify/git-utils": "^6.0.4",
@@ -86,6 +86,7 @@
     "figures": "^6.0.0",
     "filter-obj": "^6.0.0",
     "hot-shots": "11.4.0",
+    "ignore": "^7.0.0",
     "indent-string": "^5.0.0",
     "is-plain-obj": "^4.0.0",
     "keep-func-props": "^6.0.0",
@@ -152,5 +153,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "9f8b16e1b34b63d007f4dc7a91e9a440aba53ebc"
+  "gitHead": "c77982ba1d1886e81f1a517318fcf93123f2a260"
 }