@netlify/config 16.0.2 → 16.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "16.0.2",
+  "version": "16.0.6",
   "description": "Netlify config module",
   "main": "src/main.js",
   "bin": {
@@ -49,8 +49,6 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ungap/from-entries": "^0.2.1",
-    "array-flat-polyfill": "^1.0.1",
     "chalk": "^4.1.2",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -65,9 +63,9 @@
     "js-yaml": "^4.0.0",
     "make-dir": "^3.1.0",
     "map-obj": "^4.0.0",
-    "netlify": "^9.0.0",
-    "netlify-headers-parser": "^4.0.1",
-    "netlify-redirect-parser": "^12.0.0",
+    "netlify": "^10.0.0",
+    "netlify-headers-parser": "^5.0.0",
+    "netlify-redirect-parser": "^13.0.0",
     "omit.js": "^2.0.2",
     "p-locate": "^5.0.0",
     "path-exists": "^4.0.0",

package/src/api/client.js

@@ -1,17 +1,19 @@
 'use strict'
 
-const NetlifyAPI = require('netlify')
+// TODO: use static `import` after migrating `@netlify/config` to pure ES modules
+const jsClient = import('netlify')
 
 const { removeUndefined } = require('../utils/remove_falsy')
 
 // Retrieve Netlify API client, if an access token was passed
-const getApiClient = function ({ token, offline, testOpts = {}, host, scheme, pathPrefix }) {
+const getApiClient = async function ({ token, offline, testOpts = {}, host, scheme, pathPrefix }) {
   if (!token || offline) {
     return
   }
 
   // TODO: find less intrusive way to mock HTTP requests
   const parameters = removeUndefined({ scheme: testOpts.scheme || scheme, host: testOpts.host || host, pathPrefix })
+  const { NetlifyAPI } = await jsClient
   const api = new NetlifyAPI(token, parameters)
   return api
 }

package/src/bin/main.js

@@ -10,8 +10,6 @@ const { stableStringify } = require('fast-safe-stringify')
 const makeDir = require('make-dir')
 const omit = require('omit.js').default
 
-require('../utils/polyfills')
-
 const { isUserError } = require('../error')
 const resolveConfig = require('../main')
 

package/src/env/main.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const fromEntries = require('@ungap/from-entries')
 const omit = require('omit.js').default
 
 const { removeFalsy } = require('../utils/remove_falsy')
@@ -65,7 +64,7 @@ const getEnv = async function ({
     })
   })
 
-  return fromEntries(env)
+  return Object.fromEntries(env)
 }
 
 // Environment variables not set by users, but meant to mimic the production

package/src/main.js

@@ -1,8 +1,6 @@
 /* eslint-disable max-lines */
 'use strict'
 
-require('./utils/polyfills')
-
 const { getApiClient } = require('./api/client')
 const { getSiteInfo } = require('./api/site_info')
 const { getInitialBase, getBase, addBase } = require('./base')
@@ -34,7 +32,7 @@ const resolveConfig = async function (opts) {
   const { cachedConfig, cachedConfigPath, host, scheme, pathPrefix, testOpts, token, offline, ...optsA } =
     addDefaultOpts(opts)
   // `api` is not JSON-serializable, so we cannot cache it inside `cachedConfig`
-  const api = getApiClient({ token, offline, host, scheme, pathPrefix, testOpts })
+  const api = await getApiClient({ token, offline, host, scheme, pathPrefix, testOpts })
 
   const parsedCachedConfig = await getCachedConfig({ cachedConfig, cachedConfigPath, token, api })
   if (parsedCachedConfig !== undefined) {

package/src/redirects.js

@@ -2,7 +2,8 @@
 
 const { resolve } = require('path')
 
-const { parseAllRedirects } = require('netlify-redirect-parser')
+// TODO: use static `import` after migrating this repository to pure ES modules
+const netlifyRedirectParser = import('netlify-redirect-parser')
 
 const { warnRedirectsParsing } = require('./log/messages')
 
@@ -15,6 +16,7 @@ const REDIRECTS_FILENAME = '_redirects'
 
 // Add `config.redirects`
 const addRedirects = async function ({ redirects: configRedirects, ...config }, redirectsPath, logs) {
+  const { parseAllRedirects } = await netlifyRedirectParser
   const { redirects, errors } = await parseAllRedirects({
     redirectsFiles: [redirectsPath],
     configRedirects,

package/src/utils/polyfills.js

@@ -1,5 +0,0 @@
-'use strict'
-
-// Patches `Array.flat()` and `Array.flatMap()`
-// TODO: remove after dropping Node <12 support
-require('array-flat-polyfill')