@netlify/build 34.3.0 → 35.0.1

package/lib/error/colors.js

@@ -1,4 +1,4 @@
-import stripAnsi from 'strip-ansi';
+import { stripVTControlCharacters } from 'node:util';
 // Remove ANSI sequences from `error.message`
 export const removeErrorColors = function (error) {
     if (!(error instanceof Error)) {
@@ -6,8 +6,8 @@ export const removeErrorColors = function (error) {
     }
     // Setting error values might fail if they are getters or are non-writable.
     try {
-        error.message = stripAnsi(error.message);
-        error.stack = stripAnsi(error.stack);
+        error.message = stripVTControlCharacters(error.message);
+        error.stack = stripVTControlCharacters(error.stack);
     }
     catch {
         // continue

package/lib/error/parse/clean_stack.js

@@ -1,6 +1,6 @@
+import { stripVTControlCharacters } from 'node:util';
 import { cwd } from 'process';
 import cleanStack from 'clean-stack';
-import stripAnsi from 'strip-ansi';
 // Clean stack traces:
 //  - remove our internal code, e.g. the logic spawning plugins
 //  - remove node modules and Node.js internals
@@ -22,7 +22,7 @@ export const cleanStacks = function ({ stack, rawStack, debug }) {
 };
 const cleanStackLine = function (lines, line) {
     const lineA = line.replace(getCwd(), '');
-    const lineB = stripAnsi(lineA);
+    const lineB = stripVTControlCharacters(lineA);
     if (!STACK_LINE_REGEXP.test(lineB)) {
         return `${lines}\n${lineA}`;
     }

package/lib/install/missing.js

@@ -1,9 +1,7 @@
-import { promises as fs } from 'fs';
-import { normalize, resolve } from 'path';
-import { execa } from 'execa';
+import { promises as fs } from 'node:fs';
+import { normalize } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { pathExists } from 'path-exists';
-import { isFile } from 'path-type';
-import { logArray, logSubHeader } from '../log/logger.js';
 import { logInstallMissingPlugins, logInstallIntegrations } from '../log/messages/install.js';
 import { addExactDependencies } from './main.js';
 // Automatically install plugins if not already installed.
@@ -21,40 +19,28 @@ export const installMissingPlugins = async function ({ missingPlugins, autoPlugi
     await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
 };
 export const installIntegrationPlugins = async function ({ integrations, autoPluginsDir, mode, logs, context, testOpts, pluginsEnv, buildDir, }) {
-    const integrationsToBuild = integrations.filter((integration) => typeof integration.dev !== 'undefined' && context === 'dev');
-    if (integrationsToBuild.length) {
-        logSubHeader(logs, 'Building extensions');
-        logArray(logs, integrationsToBuild.map(({ slug, dev: { path } }) => `${slug} from ${path}`));
-    }
     const packages = (await Promise.all(integrations.map((integration) => getIntegrationPackage({ integration, context, testOpts, buildDir, pluginsEnv })))).filter(Boolean);
-    logInstallIntegrations(logs, integrations.filter((integration) => integrationsToBuild.every((compiledIntegration) => integration.slug !== compiledIntegration.slug)));
+    logInstallIntegrations(logs, integrations);
     if (packages.length === 0) {
         return;
     }
     await createAutoPluginsDir(logs, autoPluginsDir);
     await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
 };
-const getIntegrationPackage = async function ({ integration: { version, dev }, context, testOpts = {}, buildDir, pluginsEnv, }) {
-    if (typeof version !== 'undefined') {
-        return `${version}/packages/buildhooks.tgz`;
-    }
-    if (typeof dev !== 'undefined' && context === 'dev') {
-        const { path } = dev;
-        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(buildDir, path);
-        try {
-            const res = await execa('npm', ['run', 'build'], { cwd: integrationDir, env: pluginsEnv });
-            // This is horrible and hacky, but `npm run build` will
-            // return status code 0 even if it fails
-            if (!res.stdout.includes('Build complete!')) {
-                throw new Error(res.stdout);
-            }
-        }
-        catch (e) {
-            throw new Error(`Failed to build integration. Error:\n\n${e.stack}`);
-        }
+const getIntegrationPackage = async function ({ integration: { buildPlugin } }) {
+    if (buildPlugin === null) {
         return undefined;
     }
-    return undefined;
+    switch (buildPlugin.packageURL.protocol) {
+        case 'http:':
+        // fallthrough
+        case 'https:':
+            return buildPlugin.packageURL.toString();
+        case 'file:':
+            return fileURLToPath(buildPlugin.packageURL);
+        default:
+            throw new Error(`unsupported build plugin package URL: ${buildPlugin.packageURL.toString()}`);
+    }
 };
 // We pin the version without using semver ranges ^ nor ~
 const getPackage = function ({ packageName, expectedVersion }) {
@@ -71,8 +57,14 @@ const ensureDir = async function (logs, autoPluginsDir) {
     }
     // If `.netlify` exists but is not a directory, we remove it first
     const autoPluginsParent = normalize(`${autoPluginsDir}/..`);
-    if (await isFile(autoPluginsParent)) {
-        await fs.unlink(autoPluginsParent);
+    try {
+        const stat = await fs.stat(autoPluginsParent);
+        if (stat.isFile()) {
+            await fs.unlink(autoPluginsParent);
+        }
+    }
+    catch {
+        // do nothing since it doesn't exist
     }
     await fs.mkdir(autoPluginsDir, { recursive: true });
 };

package/lib/log/theme.d.ts

@@ -1,19 +1,20 @@
+import * as colors from 'ansis';
 /**
- * Color theme. Please use this instead of requiring chalk directly,
+ * Color theme. Please use this instead of requiring ansis directly,
  * to ensure consistent colors.
  */
 export declare const THEME: {
-    header: import("chalk").ChalkInstance;
-    subHeader: import("chalk").ChalkInstance;
-    highlightWords: import("chalk").ChalkInstance;
-    errorHeader: import("chalk").ChalkInstance;
-    errorSubHeader: import("chalk").ChalkInstance;
-    errorLine: import("chalk").ChalkInstance;
-    errorHighlightWords: import("chalk").ChalkInstance;
-    warningHeader: import("chalk").ChalkInstance;
-    warningSubHeader: import("chalk").ChalkInstance;
-    warningLine: import("chalk").ChalkInstance;
-    warningHighlightWords: import("chalk").ChalkInstance;
-    dimWords: import("chalk").ChalkInstance;
+    header: colors.Ansis;
+    subHeader: colors.Ansis;
+    highlightWords: colors.Ansis;
+    errorHeader: colors.Ansis;
+    errorSubHeader: colors.Ansis;
+    errorLine: colors.Ansis;
+    errorHighlightWords: colors.Ansis;
+    warningHeader: colors.Ansis;
+    warningSubHeader: colors.Ansis;
+    warningLine: colors.Ansis;
+    warningHighlightWords: colors.Ansis;
+    dimWords: colors.Ansis;
     none: (string: any) => any;
 };

package/lib/log/theme.js

@@ -1,27 +1,27 @@
-import chalk from 'chalk';
+import * as colors from 'ansis';
 /**
- * Color theme. Please use this instead of requiring chalk directly,
+ * Color theme. Please use this instead of requiring ansis directly,
  * to ensure consistent colors.
  */
 export const THEME = {
     // Main headers
-    header: chalk.cyanBright.bold,
+    header: colors.cyanBright.bold,
     // Single lines used as sub-headers
-    subHeader: chalk.cyan.bold,
+    subHeader: colors.cyan.bold,
     // One of several words that should be highlighted inside a line
-    highlightWords: chalk.cyan,
+    highlightWords: colors.cyan,
     // Same for errors
-    errorHeader: chalk.redBright.bold,
-    errorSubHeader: chalk.red.bold,
-    errorLine: chalk.redBright,
-    errorHighlightWords: chalk.redBright.bold,
+    errorHeader: colors.redBright.bold,
+    errorSubHeader: colors.red.bold,
+    errorLine: colors.redBright,
+    errorHighlightWords: colors.redBright.bold,
     // Same for warnings
-    warningHeader: chalk.yellowBright.bold,
-    warningSubHeader: chalk.yellow.bold,
-    warningLine: chalk.yellowBright,
-    warningHighlightWords: chalk.yellowBright.bold,
+    warningHeader: colors.yellowBright.bold,
+    warningSubHeader: colors.yellow.bold,
+    warningLine: colors.yellowBright,
+    warningHighlightWords: colors.yellowBright.bold,
     // One of several words that should be dimmed inside a line
-    dimWords: chalk.gray,
+    dimWords: colors.gray,
     // No colors
     none: (string) => string,
 };

package/lib/plugins/compatibility.js

@@ -1,9 +1,6 @@
-import _pEvery from 'p-every';
 import pLocate from 'p-locate';
 import semver from 'semver';
 import { CONDITIONS } from './plugin_conditions.js';
-// the types of that package seem to be not correct and demand a `pEvery.default()` usage which is wrong
-const pEvery = _pEvery;
 /**
  *  Retrieve the `expectedVersion` of a plugin:
  *   - This is the version which should be run
@@ -66,7 +63,7 @@ const getCompatibleEntry = async function ({ versions, nodeVersion, packageJson,
         if (conditions.length === 0 && pinnedVersion === undefined) {
             return false;
         }
-        return await pEvery(conditions, async ({ type, condition }) => CONDITIONS[type].test(condition, { nodeVersion, packageJson, packagePath, buildDir }));
+        return (await Promise.all(conditions.map(async ({ type, condition }) => CONDITIONS[type].test(condition, { nodeVersion, packageJson, packagePath, buildDir })))).every(Boolean);
     });
     if (compatibleEntry) {
         systemLog(`Used compatible version '${compatibleEntry.version}' for plugin '${packageName}' (pinned version is ${pinnedVersion})`);
@@ -98,7 +95,7 @@ const getFirstCompatibleEntry = async function ({ versions, nodeVersion, package
         if (conditions.length === 0) {
             return true;
         }
-        return await pEvery(conditions, async ({ type, condition }) => CONDITIONS[type].test(condition, { nodeVersion, packageJson, packagePath, buildDir }));
+        return (await Promise.all(conditions.map(async ({ type, condition }) => CONDITIONS[type].test(condition, { nodeVersion, packageJson, packagePath, buildDir })))).every(Boolean);
     });
     if (compatibleEntry) {
         return compatibleEntry;

package/lib/plugins/manifest/path.js

@@ -1,11 +1,11 @@
-import { locatePath } from 'locate-path';
+import fsSync from 'node:fs';
 import { addErrorInfo } from '../../error/info.js';
 // Retrieve "manifest.yml" path for a specific plugin
 export const getManifestPath = async function ({ pluginDir, packageDir, packageName }) {
     const dirs = [pluginDir, packageDir]
         .filter(Boolean)
         .flatMap((dir) => MANIFEST_FILENAMES.map((filename) => `${dir}/${filename}`));
-    const manifestPath = await locatePath(dirs);
+    const manifestPath = dirs.find((dir) => fsSync.existsSync(dir));
     validateManifestExists(manifestPath, packageName);
     return manifestPath;
 };

package/lib/plugins/plugin_conditions.js

@@ -1,10 +1,7 @@
 import { join } from 'path';
-import _pEvery from 'p-every';
 import semver from 'semver';
 import { importJsonFile } from '../utils/json.js';
 import { resolvePath } from '../utils/resolve.js';
-// the types of that package seem to be not correct and demand a `pEvery.default()` usage which is wrong
-const pEvery = _pEvery;
 /**
  * Plugins can use `compatibility.{version}.nodeVersion: 'allowedNodeVersion'`
  * to deliver different plugin versions based on the Node.js version
@@ -25,7 +22,7 @@ const siteDependenciesTest = async function (allowedSiteDependencies, { packageJ
             // noop
         }
     }
-    return await pEvery(Object.entries(allowedSiteDependencies), ([dependencyName, allowedVersion]) => siteDependencyTest({ dependencyName, allowedVersion, siteDependencies, buildDir }));
+    return (await Promise.all(Object.entries(allowedSiteDependencies).map(async ([dependencyName, allowedVersion]) => siteDependencyTest({ dependencyName, allowedVersion, siteDependencies, buildDir })))).every(Boolean);
 };
 const siteDependencyTest = async function ({ dependencyName, allowedVersion, siteDependencies, buildDir, }) {
     const siteDependency = siteDependencies[dependencyName];

package/lib/plugins/resolve.js

@@ -1,4 +1,4 @@
-import { join, resolve } from 'path';
+import { join } from 'node:path';
 import { addErrorInfo } from '../error/info.js';
 import { installMissingPlugins, installIntegrationPlugins } from '../install/missing.js';
 import { resolvePath, tryResolvePath } from '../utils/resolve.js';
@@ -39,8 +39,7 @@ export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, bu
         mode,
         logs,
     });
-    let integrationPluginOptions = [];
-    integrationPluginOptions = await handleIntegrations({
+    const integrationPluginOptions = await handleIntegrations({
         integrations,
         autoPluginsDir,
         mode,
@@ -118,9 +117,9 @@ const handleMissingPlugins = async function ({ pluginsOptions, autoPluginsDir, m
     return Promise.all(pluginsOptions.map((pluginOptions) => resolveMissingPluginPath({ pluginOptions, autoPluginsDir })));
 };
 const handleIntegrations = async function ({ integrations, autoPluginsDir, mode, logs, buildDir, context, testOpts, pluginsEnv, }) {
-    const toInstall = integrations.filter((integration) => integration.has_build);
+    const integrationsWithBuildPlugins = integrations.filter((integration) => integration.has_build);
     await installIntegrationPlugins({
-        integrations: toInstall,
+        integrations: integrationsWithBuildPlugins,
         autoPluginsDir,
         mode,
         logs,
@@ -129,26 +128,25 @@ const handleIntegrations = async function ({ integrations, autoPluginsDir, mode,
         buildDir,
         pluginsEnv,
     });
-    if (toInstall.length === 0) {
-        return [];
-    }
-    return Promise.all(toInstall.map((integration) => resolveIntegration({
-        integration,
-        autoPluginsDir,
-        buildDir,
-        context,
-        testOpts,
-    })));
-};
-const resolveIntegration = async function ({ integration, autoPluginsDir, buildDir, context, testOpts }) {
-    if (typeof integration.dev !== 'undefined' && context === 'dev') {
-        const { path } = integration.dev;
-        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(buildDir, path);
-        const pluginPath = await resolvePath(`${integrationDir}/.ntli/build`, buildDir);
-        return { pluginPath, packageName: `${integration.slug}`, isIntegration: true, integration, loadedFrom: 'local' };
-    }
-    const pluginPath = await resolvePath(`${integration.slug}-buildhooks`, autoPluginsDir);
-    return { pluginPath, packageName: `${integration.slug}-buildhooks`, isIntegration: true, integration };
+    return Promise.all(integrationsWithBuildPlugins.map(async (integration) => {
+        // TODO(ndhoule): When developing locally, the user can accidentally set an extension name in
+        // their netlify.toml that points to a build plugin package that has a mismatched name. This
+        // will result in a failed install here. The solution is non-obvious: make sure your
+        // `netlify.toml#integrations[].name` matches the extension that `netlify.toml#integrations[].dev.path`
+        // points at.
+        //
+        // (We could, for example, detect a mismatch by untarring the local build plugin package in
+        // memory and comparing its `package.json#name` to `integration.slug`, and throw a descriptive
+        // error if they don't match.)
+        const packageName = `${integration.slug}-buildhooks`;
+        return {
+            integration,
+            isIntegration: true,
+            loadedFrom: integration.buildPlugin.origin === 'local' ? 'local' : undefined,
+            packageName,
+            pluginPath: await resolvePath(packageName, autoPluginsDir),
+        };
+    }));
 };
 // Resolve the plugins that just got automatically installed
 const resolveMissingPluginPath = async function ({ pluginOptions, pluginOptions: { packageName }, autoPluginsDir }) {

package/lib/status/colors.js

@@ -1,4 +1,4 @@
-import stripAnsi from 'strip-ansi';
+import { stripVTControlCharacters } from 'node:util';
 // Remove colors from statuses
 export const removeStatusesColors = function (statuses) {
     return statuses.map(removeStatusColors);
@@ -13,6 +13,6 @@ const removeAttrColor = function (status, attribute) {
     if (value === undefined) {
         return {};
     }
-    const valueA = stripAnsi(value);
+    const valueA = stripVTControlCharacters(value);
     return { [attribute]: valueA };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "34.3.0",
+  "version": "35.0.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -67,10 +67,10 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^8.0.0",
-    "@netlify/blobs": "^10.0.6",
+    "@netlify/blobs": "^10.0.7",
     "@netlify/cache-utils": "^6.0.3",
-    "@netlify/config": "^23.2.0",
-    "@netlify/edge-bundler": "14.2.2",
+    "@netlify/config": "^24.0.1",
+    "@netlify/edge-bundler": "14.3.0",
     "@netlify/functions-utils": "^6.2.0",
     "@netlify/git-utils": "^6.0.2",
     "@netlify/opentelemetry-utils": "^2.0.1",
@@ -79,7 +79,7 @@
     "@netlify/zip-it-and-ship-it": "14.1.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^7.0.0",
-    "chalk": "^5.0.0",
+    "ansis": "^4.1.0",
     "clean-stack": "^5.0.0",
     "execa": "^8.0.0",
     "fdir": "^6.0.1",
@@ -89,21 +89,18 @@
     "indent-string": "^5.0.0",
     "is-plain-obj": "^4.0.0",
     "keep-func-props": "^6.0.0",
-    "locate-path": "^7.0.0",
     "log-process-errors": "^11.0.0",
     "map-obj": "^5.0.0",
     "memoize-one": "^6.0.0",
     "minimatch": "^9.0.4",
     "os-name": "^6.0.0",
     "p-event": "^6.0.0",
-    "p-every": "^2.0.0",
     "p-filter": "^4.0.0",
     "p-locate": "^6.0.0",
     "p-map": "^7.0.0",
     "p-reduce": "^3.0.0",
     "package-directory": "^8.0.0",
     "path-exists": "^5.0.0",
-    "path-type": "^6.0.0",
     "pretty-ms": "^9.0.0",
     "ps-list": "^8.0.0",
     "read-package-up": "^11.0.0",
@@ -113,7 +110,6 @@
     "safe-json-stringify": "^1.2.0",
     "semver": "^7.3.8",
     "string-width": "^7.0.0",
-    "strip-ansi": "^7.0.0",
     "supports-color": "^10.0.0",
     "terminal-link": "^4.0.0",
     "ts-node": "^10.9.1",
@@ -138,7 +134,7 @@
     "moize": "^6.0.0",
     "npm-run-all2": "^6.0.0",
     "process-exists": "^5.0.0",
-    "sinon": "^21.0.0",
+    "tinyspy": "^4.0.3",
     "tmp-promise": "^3.0.2",
     "tsd": "^0.32.0",
     "vitest": "^3.0.0",
@@ -156,5 +152,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "2a186393af7f577cc6bafa5d3962ea0833cd084c"
+  "gitHead": "f65a08178a04db0ad274aa62f7d46319f2ef661a"
 }