@netlify/config 20.3.2 → 20.3.3

package/lib/files.js

@@ -1,15 +1,15 @@
+import { existsSync } from 'fs';
 import { resolve, relative, parse } from 'path';
 import { getProperty, setProperty, deleteProperty } from 'dot-prop';
-import { pathExists } from 'path-exists';
 import { throwUserError } from './error.js';
 import { mergeConfigs } from './merge.js';
 import { isTruthy } from './utils/remove_falsy.js';
 // Make configuration paths relative to `buildDir` and converts them to
 // absolute paths
-export const resolveConfigPaths = async function ({ config, repositoryRoot, buildDir, baseRelDir }) {
+export const resolveConfigPaths = function ({ config, repositoryRoot, buildDir, baseRelDir }) {
     const baseRel = baseRelDir ? buildDir : repositoryRoot;
     const configA = resolvePaths(config, FILE_PATH_CONFIG_PROPS, baseRel, repositoryRoot);
-    const configB = await addDefaultPaths(configA, repositoryRoot, baseRel);
+    const configB = addDefaultPaths(configA, repositoryRoot, baseRel);
     return configB;
 };
 // All file paths in the configuration file are are relative to `buildDir`
@@ -56,10 +56,9 @@ const getWindowsDrive = function (path) {
 };
 // Some configuration properties have default values that are only set if a
 // specific directory/file exists in the build directory
-const addDefaultPaths = async function (config, repositoryRoot, baseRel) {
-    const defaultPathsConfigs = await Promise.all(DEFAULT_PATHS.map(({ defaultPath, getConfig, propName }) => addDefaultPath({ repositoryRoot, baseRel, defaultPath, getConfig, propName })));
-    const defaultPathsConfigsA = defaultPathsConfigs.filter(Boolean);
-    return mergeConfigs([...defaultPathsConfigsA, config]);
+const addDefaultPaths = function (config, repositoryRoot, baseRel) {
+    const defaultPathsConfigs = DEFAULT_PATHS.map(({ defaultPath, getConfig, propName }) => addDefaultPath({ repositoryRoot, baseRel, defaultPath, getConfig, propName })).filter(Boolean);
+    return mergeConfigs([...defaultPathsConfigs, config]);
 };
 const DEFAULT_PATHS = [
     // @todo Remove once we drop support for the legacy default functions directory.
@@ -79,9 +78,9 @@ const DEFAULT_PATHS = [
         propName: 'build.edge_functions',
     },
 ];
-const addDefaultPath = async function ({ repositoryRoot, baseRel, defaultPath, getConfig, propName }) {
+const addDefaultPath = function ({ repositoryRoot, baseRel, defaultPath, getConfig, propName }) {
     const absolutePath = resolvePath(repositoryRoot, baseRel, defaultPath, propName);
-    if (!(await pathExists(absolutePath))) {
+    if (!existsSync(absolutePath)) {
         return;
     }
     return getConfig(absolutePath);

package/lib/main.js

@@ -204,7 +204,7 @@ const normalizeConfigAndContext = function (config, origin) {
 const resolveFiles = async function ({ config, repositoryRoot, base, baseRelDir }) {
     const baseA = getBase(base, repositoryRoot, config);
     const buildDir = await getBuildDir(repositoryRoot, baseA);
-    const configA = await resolveConfigPaths({ config, repositoryRoot, buildDir, baseRelDir });
+    const configA = resolveConfigPaths({ config, repositoryRoot, buildDir, baseRelDir });
     const configB = addBase(configA, baseA);
     return { config: configB, buildDir, base: baseA };
 };

package/lib/mutations/update.js

@@ -1,5 +1,4 @@
-import { promises as fs } from 'fs';
-import { pathExists } from 'path-exists';
+import { existsSync, promises as fs } from 'fs';
 import { ensureConfigPriority } from '../context.js';
 import { addHeaders } from '../headers.js';
 import { mergeConfigs } from '../merge.js';
@@ -41,7 +40,7 @@ const saveConfig = async function (configPath, simplifiedConfig) {
 // Deletes `_headers/_redirects` since they are merged to `netlify.toml`,
 // to fix any priority problem.
 const deleteSideFile = async function (filePath) {
-    if (filePath === undefined || !(await pathExists(filePath))) {
+    if (filePath === undefined || !existsSync(filePath)) {
         return;
     }
     await fs.unlink(filePath);
@@ -76,7 +75,7 @@ const getTempDir = function (buildDir) {
 const backupFile = async function (original, backup) {
     // this makes sure we don't restore stale files
     await deleteNoError(backup);
-    if (!(await pathExists(original))) {
+    if (!existsSync(original)) {
         return;
     }
     await fs.copyFile(original, backup);
@@ -90,7 +89,7 @@ const deleteNoError = async (path) => {
     }
 };
 const copyOrDelete = async function (src, dest) {
-    if (await pathExists(src)) {
+    if (existsSync(src)) {
         await fs.copyFile(src, dest);
         return;
     }

package/lib/options/base.js

@@ -1,6 +1,5 @@
-import { promises as fs } from 'fs';
+import { existsSync, promises as fs } from 'fs';
 import { dirname, relative, sep } from 'path';
-import { pathExists } from 'path-exists';
 // Retrieve `base` override.
 // This uses any directory below `repositoryRoot` and above (or equal to)
 // `cwd` that has a `.netlify` or `netlify.toml`. This allows Netlify CLI users
@@ -47,7 +46,7 @@ const locatePath = async function (paths) {
     return path;
 };
 const returnIfExists = async function (path) {
-    if (!(await pathExists(path))) {
+    if (!existsSync(path)) {
         return;
     }
     return path;

package/lib/parse.js

@@ -1,22 +1,27 @@
-import { promises as fs } from 'fs';
-import { pathExists } from 'path-exists';
+import { existsSync, promises as fs } from 'fs';
 import { throwUserError } from './error.js';
 import { throwOnInvalidTomlSequence } from './log/messages.js';
 import { parseToml } from './utils/toml.js';
-// Load the configuration file and parse it (TOML)
+/**
+ * Load the configuration file and parse it (TOML)
+ * @param configPath The path to the toml file
+ * @returns
+ */
 export const parseConfig = async function (configPath) {
     if (configPath === undefined) {
         return {};
     }
-    if (!(await pathExists(configPath))) {
+    if (!existsSync(configPath)) {
         throwUserError('Configuration file does not exist');
     }
     return await readConfigPath(configPath);
 };
-// Same but `configPath` is required and `configPath` might point to a
-// non-existing file.
+/**
+ * Same but `configPath` is required and `configPath` might point to a
+ * non-existing file.
+ */
 export const parseOptionalConfig = async function (configPath) {
-    if (!(await pathExists(configPath))) {
+    if (!existsSync(configPath)) {
         return {};
     }
     return await readConfigPath(configPath);
@@ -31,7 +36,9 @@ const readConfigPath = async function (configPath) {
         throwUserError('Could not parse configuration file', error);
     }
 };
-// Reach the configuration file's raw content
+/**
+ * Reach the configuration file's raw content
+ */
 const readConfig = async function (configPath) {
     try {
         return await fs.readFile(configPath, 'utf8');
@@ -48,9 +55,11 @@ const validateTomlBlackslashes = function (configString) {
     const [, invalidTripleSequence, invalidSequence = invalidTripleSequence] = result;
     throwOnInvalidTomlSequence(invalidSequence);
 };
-// The TOML specification forbids unrecognized backslash sequences. However,
-// `toml-node` does not respect the specification and do not fail on those.
-// Therefore, we print a warning message.
-// This only applies to " and """ strings, not ' nor '''
-// Also, """ strings can use trailing backslashes.
+/**
+ * The TOML specification forbids unrecognized backslash sequences. However,
+ * `toml-node` does not respect the specification and do not fail on those.
+ * Therefore, we print a warning message.
+ * This only applies to " and """ strings, not ' nor '''
+ * Also, """ strings can use trailing backslashes.
+ */
 const INVALID_TOML_BLACKSLASH = /\n[a-zA-Z]+ *= *(?:(?:""".*(?<!\\)(\\[^"\\btnfruU\n]).*""")|(?:"(?!")[^\n]*(?<!\\)(\\[^"\\btnfruU])[^\n]*"))/su;

package/lib/path.js

@@ -1,39 +1,45 @@
+import { existsSync } from 'fs';
 import { resolve } from 'path';
 import { findUp } from 'find-up';
 import pLocate from 'p-locate';
-import { pathExists } from 'path-exists';
-// Configuration location can be:
-//  - a local path with the --config CLI flag
-//  - a `netlify.*` file in the `repositoryRoot/{base}`
-//  - a `netlify.*` file in the `repositoryRoot`
-//  - a `netlify.*` file in the current directory or any parent
+/**
+ * Configuration location can be:
+ * - a local path with the --config CLI flag
+ * - a `netlify.*` file in the `repositoryRoot/{base}`
+ * - a `netlify.*` file in the `repositoryRoot`
+ * - a `netlify.*` file in the current directory or any parent
+ */
 export const getConfigPath = async function ({ configOpt, cwd, repositoryRoot, configBase }) {
     const configPath = await pLocate([
         searchConfigOpt(cwd, configOpt),
-        searchBaseConfigFile(repositoryRoot, configBase),
+        searchBaseConfigFile(configBase),
         searchConfigFile(repositoryRoot),
         findUp(FILENAME, { cwd }),
     ], Boolean);
     return configPath;
 };
-// --config CLI flag
+/** --config CLI flag */
 const searchConfigOpt = function (cwd, configOpt) {
     if (configOpt === undefined) {
         return;
     }
     return resolve(cwd, configOpt);
 };
-// Look for `repositoryRoot/{base}/netlify.*`
-const searchBaseConfigFile = function (repositoryRoot, configBase) {
+/**
+ * Look for `repositoryRoot/{base}/netlify.*`
+ */
+const searchBaseConfigFile = function (configBase) {
     if (configBase === undefined) {
         return;
     }
     return searchConfigFile(configBase);
 };
-// Look for several file extensions for `netlify.*`
-const searchConfigFile = async function (cwd) {
+/**
+ * Look for several file extensions for `netlify.*`
+ */
+const searchConfigFile = function (cwd) {
     const path = resolve(cwd, FILENAME);
-    if (!(await pathExists(path))) {
+    if (!existsSync(path)) {
         return;
     }
     return path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.3.2",
+  "version": "20.3.3",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/main.js",
@@ -75,7 +75,6 @@
     "netlify-redirect-parser": "^14.1.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
-    "path-exists": "^5.0.0",
     "path-type": "^5.0.0",
     "toml": "^3.0.0",
     "tomlify-j0.4": "^3.0.0",
@@ -95,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "8eb416097fbc9ac580fe0687efd1a9da9a2dcd80"
+  "gitHead": "d78a65c209ed987d3475cd1f37cf357693b99e3c"
 }