@netlify/build 35.0.0 → 35.0.2

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

@@ -2,7 +2,6 @@ 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 { logInstallMissingPlugins, logInstallIntegrations } from '../log/messages/install.js';
 import { addExactDependencies } from './main.js';
 // Automatically install plugins if not already installed.
@@ -58,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/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/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": "35.0.0",
+  "version": "35.0.2",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,8 +69,8 @@
     "@bugsnag/js": "^8.0.0",
     "@netlify/blobs": "^10.0.7",
     "@netlify/cache-utils": "^6.0.3",
-    "@netlify/config": "^24.0.0",
-    "@netlify/edge-bundler": "14.2.2",
+    "@netlify/config": "^24.0.1",
+    "@netlify/edge-bundler": "14.4.0",
     "@netlify/functions-utils": "^6.2.0",
     "@netlify/git-utils": "^6.0.2",
     "@netlify/opentelemetry-utils": "^2.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": "5100d463cb9b606b91a6a9b5c3fbe9c143716701"
+  "gitHead": "1f098009f518b66b0d6604910aff38824d7f9a69"
 }