netlify-cli 12.2.9 → 12.2.11

package/src/utils/{parse-raw-flags.cjs → parse-raw-flags.mjs}

@@ -10,7 +10,7 @@
 // // rawFlags = {stuff: yay!}
 //
 
-const parseRawFlags = function (raw) {
+export const parseRawFlags = function (raw) {
   const rawFlags = raw.reduce((acc, curr, index, array) => {
     if (/^-{1,2}/.test(curr)) {
       const key = curr.replace(/^-{1,2}/, '')
@@ -28,7 +28,7 @@ const parseRawFlags = function (raw) {
   return rawFlags
 }
 
-const aggressiveJSONParse = function (value) {
+export const aggressiveJSONParse = function (value) {
   if (value === 'true') {
     return true
   }
@@ -47,8 +47,3 @@ const aggressiveJSONParse = function (value) {
   }
   return parsed
 }
-
-module.exports = {
-  parseRawFlags,
-  aggressiveJSONParse,
-}

package/src/utils/proxy.mjs

@@ -20,14 +20,18 @@ import locatePath from 'locate-path'
 import pFilter from 'p-filter'
 import toReadableStream from 'to-readable-stream'
 
-import edgeFunctions from '../lib/edge-functions/index.cjs'
+import {
+  handleProxyRequest,
+  initializeProxy as initializeEdgeFunctionsProxy,
+  isEdgeFunctionsRequest,
+} from '../lib/edge-functions/proxy.mjs'
 import { fileExistsAsync, isFileAsync } from '../lib/fs.cjs'
-import renderErrorTemplate from '../lib/render-error-remplate.cjs'
+import renderErrorTemplate from '../lib/render-error-template.mjs'
 
-import { NETLIFYDEVLOG, NETLIFYDEVWARN } from './command-helpers.cjs'
+import { NETLIFYDEVLOG, NETLIFYDEVWARN } from './command-helpers.mjs'
 import createStreamPromise from './create-stream-promise.mjs'
-import { headersForPath, parseHeaders } from './headers.cjs'
-import { createRewriter, onChanges } from './rules-proxy.cjs'
+import { headersForPath, parseHeaders } from './headers.mjs'
+import { createRewriter, onChanges } from './rules-proxy.mjs'
 
 const decompress = util.promisify(zlib.gunzip)
 const shouldGenerateETag = Symbol('Internal: response should generate ETag')
@@ -338,15 +342,15 @@ const initializeProxy = async function ({ configPath, distDir, host, port, proje
       'Content-Type': 'text/plain',
     })
 
-    const message = edgeFunctions.isEdgeFunctionsRequest(req)
+    const message = isEdgeFunctionsRequest(req)
       ? 'There was an error with an Edge Function. Please check the terminal for more details.'
       : 'Could not proxy request.'
 
     res.end(message)
   })
   proxy.on('proxyReq', (proxyReq, req) => {
-    if (edgeFunctions.isEdgeFunctionsRequest(req)) {
-      edgeFunctions.handleProxyRequest(req, proxyReq)
+    if (isEdgeFunctionsRequest(req)) {
+      handleProxyRequest(req, proxyReq)
     }
 
     // eslint-disable-next-line no-underscore-dangle
@@ -428,7 +432,7 @@ const initializeProxy = async function ({ configPath, distDir, host, port, proje
 
       const isUncaughtError = proxyRes.headers['x-nf-uncaught-error'] === '1'
 
-      if (edgeFunctions.isEdgeFunctionsRequest(req) && isUncaughtError) {
+      if (isEdgeFunctionsRequest(req) && isUncaughtError) {
         const acceptsHtml = req.headers && req.headers.accept && req.headers.accept.includes('text/html')
         const decompressedBody = await decompress(responseBody)
         const formattedBody = formatEdgeFunctionError(decompressedBody, acceptsHtml)
@@ -541,7 +545,7 @@ export const startProxy = async function ({
   state,
 }) {
   const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null
-  const edgeFunctionsProxy = await edgeFunctions.initializeProxy({
+  const edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
     config,
     configPath,
     env,

package/src/utils/{redirects.cjs → redirects.mjs}

@@ -1,13 +1,11 @@
 // @ts-check
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyRedirectParser = import('netlify-redirect-parser')
+import { parseAllRedirects } from 'netlify-redirect-parser'
 
-const { NETLIFYDEVERR, log } = require('./command-helpers.cjs')
+import { NETLIFYDEVERR, log } from './command-helpers.mjs'
 
 // Parse, normalize and validate all redirects from `_redirects` files
 // and `netlify.toml`
-const parseRedirects = async function ({ configPath, redirectsFiles }) {
-  const { parseAllRedirects } = await netlifyRedirectParser
+export const parseRedirects = async function ({ configPath, redirectsFiles }) {
   const { errors, redirects } = await parseAllRedirects({
     redirectsFiles,
     netlifyConfigPath: configPath,
@@ -52,5 +50,3 @@ const normalizeRedirect = function ({
     },
   }
 }
-
-module.exports = { parseRedirects }

package/src/utils/{rules-proxy.cjs → rules-proxy.mjs}

@@ -1,19 +1,19 @@
 // @ts-check
-const path = require('path')
+import path from 'path'
 
-const chokidar = require('chokidar')
-const cookie = require('cookie')
-const redirector = require('netlify-redirector')
-const pFilter = require('p-filter')
+import chokidar from 'chokidar'
+import cookie from 'cookie'
+import redirector from 'netlify-redirector'
+import pFilter from 'p-filter'
 
-const { fileExistsAsync } = require('../lib/fs.cjs')
+import { fileExistsAsync } from '../lib/fs.cjs'
 
-const { NETLIFYDEVLOG } = require('./command-helpers.cjs')
-const { parseRedirects } = require('./redirects.cjs')
+import { NETLIFYDEVLOG } from './command-helpers.mjs'
+import { parseRedirects } from './redirects.mjs'
 
 const watchers = []
 
-const onChanges = function (files, listener) {
+export const onChanges = function (files, listener) {
   files.forEach((file) => {
     const watcher = chokidar.watch(file)
     watcher.on('change', listener)
@@ -22,18 +22,25 @@ const onChanges = function (files, listener) {
   })
 }
 
-const getWatchers = function () {
+export const getWatchers = function () {
   return watchers
 }
 
-const getLanguage = function (headers) {
+export const getLanguage = function (headers) {
   if (headers['accept-language']) {
     return headers['accept-language'].split(',')[0].slice(0, 2)
   }
   return 'en'
 }
 
-const createRewriter = async function ({ configPath, distDir, geoCountry, jwtRoleClaim, jwtSecret, projectDir }) {
+export const createRewriter = async function ({
+  configPath,
+  distDir,
+  geoCountry,
+  jwtRoleClaim,
+  jwtSecret,
+  projectDir,
+}) {
   let matcher = null
   const redirectsFiles = [...new Set([path.resolve(distDir, '_redirects'), path.resolve(projectDir, '_redirects')])]
   let redirects = await parseRedirects({ redirectsFiles, configPath })
@@ -95,10 +102,3 @@ const createRewriter = async function ({ configPath, distDir, geoCountry, jwtRol
     return match
   }
 }
-
-module.exports = {
-  onChanges,
-  getLanguage,
-  createRewriter,
-  getWatchers,
-}

package/src/utils/sites/{utils.cjs → utils.mjs}

@@ -1,6 +1,6 @@
-const fetch = require('node-fetch')
+import fetch from 'node-fetch'
 
-const getTemplatesFromGitHub = async (token) => {
+export const getTemplatesFromGitHub = async (token) => {
   const getPublicGitHubReposFromOrg = new URL(`https://api.github.com/orgs/netlify-templates/repos`)
   // GitHub returns 30 by default and we want to avoid our limit
   // due to our archived repositories at any given time
@@ -21,7 +21,7 @@ const getTemplatesFromGitHub = async (token) => {
   return allTemplates
 }
 
-const validateTemplate = async ({ ghToken, templateName }) => {
+export const validateTemplate = async ({ ghToken, templateName }) => {
   const response = await fetch(`https://api.github.com/repos/${templateName}`, {
     headers: {
       Authorization: `token ${ghToken}`,
@@ -37,10 +37,11 @@ const validateTemplate = async ({ ghToken, templateName }) => {
   }
 
   const data = await response.json()
+
   return { exists: true, isTemplate: data.is_template }
 }
 
-const createRepo = async (templateName, ghToken, siteName) => {
+export const createRepo = async (templateName, ghToken, siteName) => {
   const resp = await fetch(`https://api.github.com/repos/${templateName}/generate`, {
     method: 'POST',
     headers: {
@@ -52,7 +53,6 @@ const createRepo = async (templateName, ghToken, siteName) => {
   })
 
   const data = await resp.json()
+
   return data
 }
-
-module.exports = { getTemplatesFromGitHub, createRepo, validateTemplate }

package/src/utils/telemetry/telemetry.mjs

@@ -5,8 +5,8 @@ import { fileURLToPath } from 'url'
 
 import { isCI } from 'ci-info'
 
-import execa from '../execa.cjs'
-import getGlobalConfig from '../get-global-config.cjs'
+import execa from '../execa.mjs'
+import getGlobalConfig from '../get-global-config.mjs'
 
 import isValidEventName from './validation.mjs'
 

package/src/utils/telemetry/validation.mjs

@@ -1,7 +1,7 @@
 /**
  * Utility to validating analytic event names for clean data
  */
-import { log } from '../command-helpers.cjs'
+import { log } from '../command-helpers.mjs'
 
 export default function isValidEventName(eventName, config) {
   const validProject = [config.projectName]

package/src/lib/account.cjs

@@ -1,9 +0,0 @@
-const dotProp = require('dot-prop')
-
-const supportsBooleanCapability = (account, capability) => dotProp.get(account, `capabilities.${capability}.included`)
-
-const supportsBackgroundFunctions = (account) => supportsBooleanCapability(account, 'background_functions')
-
-module.exports = {
-  supportsBackgroundFunctions,
-}

package/src/lib/edge-functions/consts.cjs

@@ -1,11 +0,0 @@
-const DIST_IMPORT_MAP_PATH = 'edge-functions-import-map.json'
-const INTERNAL_EDGE_FUNCTIONS_FOLDER = 'edge-functions'
-const EDGE_FUNCTIONS_FOLDER = 'edge-functions-dist'
-const PUBLIC_URL_PATH = '.netlify/internal/edge-functions'
-
-module.exports = {
-  DIST_IMPORT_MAP_PATH,
-  INTERNAL_EDGE_FUNCTIONS_FOLDER,
-  EDGE_FUNCTIONS_FOLDER,
-  PUBLIC_URL_PATH,
-}

package/src/lib/edge-functions/index.cjs

@@ -1,6 +0,0 @@
-// @ts-check
-const constants = require('./consts.cjs')
-const deploy = require('./deploy.cjs')
-const proxy = require('./proxy.cjs')
-
-module.exports = { ...constants, ...deploy, ...proxy }

package/src/lib/path.cjs

@@ -1,3 +0,0 @@
-const normalizeBackslash = (path) => path.replace(/\\/g, '/')
-
-module.exports = { normalizeBackslash }

package/src/utils/deploy/constants.cjs

@@ -1,31 +0,0 @@
-// Local deploy timeout: 20 mins
-const DEFAULT_DEPLOY_TIMEOUT = 1.2e6
-// Concurrent file hash calls
-const DEFAULT_CONCURRENT_HASH = 1e2
-// Number of concurrent uploads
-const DEFAULT_CONCURRENT_UPLOAD = 5
-// Number of files
-const DEFAULT_SYNC_LIMIT = 1e2
-// Number of times to retry an upload
-const DEFAULT_MAX_RETRY = 5
-
-const UPLOAD_RANDOM_FACTOR = 0.5
-// 5 seconds
-const UPLOAD_INITIAL_DELAY = 5e3
-// 1.5 minute
-const UPLOAD_MAX_DELAY = 9e4
-
-// 1 second
-const DEPLOY_POLL = 1e3
-
-module.exports = {
-  DEFAULT_DEPLOY_TIMEOUT,
-  DEFAULT_CONCURRENT_HASH,
-  DEFAULT_CONCURRENT_UPLOAD,
-  DEFAULT_SYNC_LIMIT,
-  DEFAULT_MAX_RETRY,
-  UPLOAD_RANDOM_FACTOR,
-  UPLOAD_INITIAL_DELAY,
-  UPLOAD_MAX_DELAY,
-  DEPLOY_POLL,
-}

package/src/utils/deploy/index.cjs

@@ -1,4 +0,0 @@
-// @ts-check
-const { deploySite } = require('./deploy-site.cjs')
-
-module.exports = { deploySite }

package/src/utils/execa.cjs

@@ -1,12 +0,0 @@
-const { env } = require('process')
-
-const execaLib = require('execa')
-
-// This is a thin layer on top of `execa` that allows consumers to provide an
-// alternative path to the module location, making it easier to mock its logic
-// in tests (see `tests/utils/mock-execa.js`).
-
-// eslint-disable-next-line import/no-dynamic-require
-const execa = env.NETLIFY_CLI_EXECA_PATH ? require(env.NETLIFY_CLI_EXECA_PATH) : execaLib
-
-module.exports = execa

package/src/utils/get-global-config.cjs

@@ -1,47 +0,0 @@
-const { readFile } = require('fs').promises
-
-const Configstore = require('configstore')
-const memoizeOne = require('memoize-one')
-const { v4: uuidv4 } = require('uuid')
-
-const { getLegacyPathInHome, getPathInHome } = require('../lib/settings.cjs')
-
-const globalConfigDefaults = {
-  /* disable stats from being sent to Netlify */
-  telemetryDisabled: false,
-  /* cliId */
-  cliId: uuidv4(),
-}
-
-const getGlobalConfigOnce = async function () {
-  const configPath = getPathInHome(['config.json'])
-  // Legacy config file in home ~/.netlify/config.json
-  const legacyPath = getLegacyPathInHome(['config.json'])
-  let legacyConfig
-  // Read legacy config if exists
-  try {
-    legacyConfig = JSON.parse(await readFile(legacyPath))
-  } catch {}
-  // Use legacy config as default values
-  const defaults = { ...globalConfigDefaults, ...legacyConfig }
-  const configStore = new Configstore(null, defaults, { configPath })
-
-  return configStore
-}
-
-const getGlobalConfig = async function () {
-  const retries = 3
-  // eslint-disable-next-line fp/no-loops
-  for (let retry = 1; retry <= retries; retry++) {
-    try {
-      return await getGlobalConfigOnce()
-    } catch (error) {
-      if (retry === retries) {
-        throw error
-      }
-    }
-  }
-}
-
-// Memoise config result so that we only load it once
-module.exports = memoizeOne(getGlobalConfig)

package/src/utils/index.cjs

@@ -1,22 +0,0 @@
-// @ts-check
-const commandHelpers = require('./command-helpers.cjs')
-const deploy = require('./deploy/index.cjs')
-const dev = require('./dev.cjs')
-const env = require('./env/index.cjs')
-const execa = require('./execa.cjs')
-const getGlobalConfig = require('./get-global-config.cjs')
-const ghAuth = require('./gh-auth.cjs')
-const openBrowser = require('./open-browser.cjs')
-const parseRawFlags = require('./parse-raw-flags.cjs')
-
-module.exports = {
-  ...commandHelpers,
-  ...deploy,
-  ...dev,
-  ...env,
-  ...ghAuth,
-  ...openBrowser,
-  ...parseRawFlags,
-  execa,
-  getGlobalConfig,
-}