@netlify/build 35.0.2 → 35.0.3

package/lib/core/config.js

@@ -1,5 +1,4 @@
 import { resolveConfig, restoreConfig, updateConfig } from '@netlify/config';
-import mapObj from 'map-obj';
 import { getChildEnv } from '../env/main.js';
 import { addApiErrorHandlers } from '../error/api.js';
 import { changeErrorType } from '../error/info.js';
@@ -45,7 +44,7 @@ const tLoadConfig = async function ({ configOpts, cachedConfig, defaultConfig, c
         logConfigInfo({ logs, configPath, buildDir, netlifyConfig, context: contextA, debug });
     }
     const apiA = addApiErrorHandlers(api);
-    const envValues = mapObj(env, (key, { value }) => [key, value]);
+    const envValues = Object.fromEntries(Object.entries(env).map(([key, { value }]) => [key, value]));
     const childEnv = getChildEnv({ envOpt, env: envValues });
     const [{ packageJson }, userNodeVersion] = await Promise.all([getPackageJson(buildDir), getUserNodeVersion(nodePath)]);
     return {

package/lib/core/constants.d.ts

@@ -102,20 +102,5 @@ export declare const addMutableConstants: ({ constants, buildDir, netlifyConfig:
         functionsDirectory: any;
     };
 }) => Promise<{
-    FUNCTIONS_SRC: string | undefined;
-    EDGE_FUNCTIONS_SRC: string | undefined;
-    CONFIG_PATH: string | undefined;
-    PUBLISH_DIR: string | undefined;
-    FUNCTIONS_DIST: string | undefined;
-    INTERNAL_EDGE_FUNCTIONS_SRC: string | undefined;
-    INTERNAL_FUNCTIONS_SRC: string | undefined;
-    EDGE_FUNCTIONS_DIST: string | undefined;
-    CACHE_DIR: string | undefined;
-    PACKAGE_PATH: string | undefined;
-    IS_LOCAL: string | undefined;
-    NETLIFY_BUILD_VERSION: string | undefined;
-    SITE_ID: string | undefined;
-    ACCOUNT_ID: string | undefined;
-    NETLIFY_API_TOKEN: string | undefined;
-    NETLIFY_API_HOST: string | undefined;
+    [k: string]: string | boolean | undefined;
 }>;

package/lib/core/constants.js

@@ -1,6 +1,5 @@
 import { relative, normalize, join } from 'path';
 import { getCacheDir } from '@netlify/cache-utils';
-import mapObj from 'map-obj';
 import { pathExists } from 'path-exists';
 import { ROOT_PACKAGE_JSON } from '../utils/json.js';
 /**
@@ -91,13 +90,13 @@ const addDefaultConstant = async function ({ constants, constantName, defaultPat
     return { [constantName]: defaultPath };
 };
 const normalizeConstantsPaths = function (constants, buildDir) {
-    return mapObj(constants, (key, path) => [key, normalizePath(path, buildDir, key)]);
+    return Object.fromEntries(Object.entries(constants).map(([key, path]) => [key, normalizePath(path, buildDir, key)]));
 };
 // The current directory is `buildDir`. Most constants are inside this `buildDir`.
 // Instead of passing absolute paths, we pass paths relative to `buildDir`, so
 // that logs are less verbose.
 const normalizePath = function (path, buildDir, key) {
-    if (path === undefined || path === '' || !CONSTANT_PATHS.has(key)) {
+    if (typeof path !== 'string' || path === '' || !CONSTANT_PATHS.has(key)) {
         return path;
     }
     const pathA = normalize(path);

package/lib/env/changes.d.ts

@@ -1,6 +1,4 @@
-export function getNewEnvChanges(envBefore: any, netlifyConfig: any, netlifyConfigCopy: any): {
-    [x: string]: any;
-};
+export function getNewEnvChanges(envBefore: any, netlifyConfig: any, netlifyConfigCopy: any): any;
 export function setEnvChanges(envChanges: any, currentEnv?: NodeJS.ProcessEnv): {
     [key: string]: string | undefined;
     TZ?: string;

package/lib/env/changes.js

@@ -1,6 +1,5 @@
 import { env } from 'process';
 import { includeKeys } from 'filter-obj';
-import mapObj from 'map-obj';
 // If plugins modify `process.env`, this is propagated in other plugins and in
 // `build.command`. Since those are different processes, we figure out when they
 // do this and communicate the new `process.env` to other processes.
@@ -12,14 +11,14 @@ export const getNewEnvChanges = function (envBefore, netlifyConfig, netlifyConfi
 const diffEnv = function (envBefore, envAfter) {
     const envChanges = includeKeys(envAfter, (name, value) => value !== envBefore[name]);
     const deletedEnv = includeKeys(envBefore, (name) => envAfter[name] === undefined);
-    const deletedEnvA = mapObj(deletedEnv, setToNull);
+    const deletedEnvA = Object.fromEntries(Object.entries(deletedEnv).map(setToNull));
     return { ...envChanges, ...deletedEnvA };
 };
 // `undefined` is not JSON-serializable (which is used in process IPC), so we
 // convert it to `null`
 // Note: `process.env[name] = undefined` actually does
 // `process.env[name] = 'undefined'` in Node.js.
-const setToNull = function (name) {
+const setToNull = function ([name]) {
     return [name, null];
 };
 // Set `process.env` changes from a previous different plugin.

package/lib/error/api.d.ts

@@ -1 +1 @@
-export function addApiErrorHandlers(api: any): (Record<string, any> & Record<string, unknown>) | undefined;
+export function addApiErrorHandlers(api: any): any;

package/lib/error/api.js

@@ -1,14 +1,13 @@
 import isPlainObj from 'is-plain-obj';
-import mapObj from 'map-obj';
 import { addErrorInfo } from './info.js';
 // Wrap `api.*` methods so that they add more error information
 export const addApiErrorHandlers = function (api) {
     if (api === undefined) {
         return;
     }
-    return mapObj(api, addErrorHandler);
+    return Object.fromEntries(Object.entries(api).map(addErrorHandler));
 };
-const addErrorHandler = function (key, value) {
+const addErrorHandler = function ([key, value]) {
     if (typeof value !== 'function') {
         return [key, value];
     }

package/lib/plugins/child/run.d.ts

@@ -13,9 +13,7 @@ export function run({ event, error, constants, envChanges, featureFlags, netlify
     packageJson: any;
     verbose: any;
 }): Promise<{
-    newEnvChanges: {
-        [x: string]: any;
-    };
+    newEnvChanges: any;
     configMutations: any;
     returnValue: {
         generatedFunctions: any[];

package/lib/plugins/child/status.js

@@ -1,5 +1,4 @@
 import isPlainObj from 'is-plain-obj';
-import mapObj from 'map-obj';
 import { addErrorInfo } from '../../error/info.js';
 // Report status information to the UI
 export const show = function (runState, showArgs) {
@@ -53,9 +52,9 @@ const validateShowArgsExtraData = function (extraData) {
     }
 };
 const removeEmptyStrings = function (showArgs) {
-    return mapObj(showArgs, removeEmptyString);
+    return Object.fromEntries(Object.entries(showArgs).map(removeEmptyString));
 };
-const removeEmptyString = function (key, value) {
+const removeEmptyString = function ([key, value]) {
     if (typeof value === 'string' && value.trim() === '') {
         return [key];
     }

package/lib/plugins_core/frameworks_api/util.js

@@ -1,7 +1,6 @@
 import { promises as fs } from 'fs';
 import { resolve } from 'path';
 import isPlainObject from 'is-plain-obj';
-import mapObject, { mapObjectSkip } from 'map-obj';
 import { FRAMEWORKS_API_CONFIG_ENDPOINT } from '../../utils/frameworks_api.js';
 export const loadConfigFile = async (buildDir, packagePath) => {
     const configPath = resolve(buildDir, packagePath ?? '', FRAMEWORKS_API_CONFIG_ENDPOINT);
@@ -48,15 +47,20 @@ export const isAllowedProperty = (property, allowedProperties) => allowedPropert
  * recursively, so `allowedProperties` can contain the full list of properties
  * that the Deploy Configuration API can interact with.
  */
-export const filterConfig = (obj, path, allowedProperties, systemLog) => mapObject(obj, (key, value) => {
+export const filterConfig = (obj, path, allowedProperties, systemLog) => Object.fromEntries(Object.entries(obj)
+    .filter(([key]) => {
     const keyPath = [...path, key];
     if (!isAllowedProperty(keyPath, allowedProperties)) {
         systemLog(`Discarding property that is not supported by the Deploy Configuration API: ${keyPath.join('.')}`);
-        return mapObjectSkip;
+        return false;
     }
+    return true;
+})
+    .map(([key, value]) => {
+    const keyPath = [...path, key];
     if (!isPlainObject(value)) {
         systemLog(`Loading property from Deploy Configuration API: ${keyPath.join('.')}`);
         return [key, value];
     }
     return [key, filterConfig(value, keyPath, allowedProperties, systemLog)];
-});
+}));

package/lib/plugins_core/functions/zisi.js

@@ -1,5 +1,4 @@
 import { join, resolve } from 'path';
-import mapObject from 'map-obj';
 import semver from 'semver';
 import { getZisiFeatureFlags } from './feature_flags.js';
 const getLambdaNodeVersion = (childEnv, userNodeVersion) => {
@@ -20,10 +19,10 @@ const getLambdaNodeVersion = (childEnv, userNodeVersion) => {
 export const getZisiParameters = ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, repositoryRoot, userNodeVersion, systemLog, }) => {
     const nodeVersion = getLambdaNodeVersion(childEnv, userNodeVersion);
     const manifest = join(functionsDist, 'manifest.json');
-    const config = mapObject(functionsConfig, (expression, object) => [
+    const config = Object.fromEntries(Object.entries(functionsConfig).map(([expression, object]) => [
         expression,
         normalizeFunctionConfig({ buildDir, functionConfig: object, isRunningLocally, nodeVersion }),
-    ]);
+    ]));
     const zisiFeatureFlags = getZisiFeatureFlags(featureFlags);
     // Only the legacy internal functions directory is allowed to have a JSON
     // config file.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "35.0.2",
+  "version": "35.0.3",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,13 +70,13 @@
     "@netlify/blobs": "^10.0.7",
     "@netlify/cache-utils": "^6.0.3",
     "@netlify/config": "^24.0.1",
-    "@netlify/edge-bundler": "14.4.0",
-    "@netlify/functions-utils": "^6.2.0",
+    "@netlify/edge-bundler": "14.4.1",
+    "@netlify/functions-utils": "^6.2.1",
     "@netlify/git-utils": "^6.0.2",
     "@netlify/opentelemetry-utils": "^2.0.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^6.0.2",
-    "@netlify/zip-it-and-ship-it": "14.1.0",
+    "@netlify/zip-it-and-ship-it": "14.1.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^7.0.0",
     "ansis": "^4.1.0",
@@ -90,7 +90,6 @@
     "is-plain-obj": "^4.0.0",
     "keep-func-props": "^6.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",
@@ -152,5 +151,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "1f098009f518b66b0d6604910aff38824d7f9a69"
+  "gitHead": "2b427686f1d4cfc2d28b79d4ce18ad691f270d2e"
 }