netlify-cli 8.0.7 → 8.1.0-rc

package/src/utils/command.js

@@ -1,262 +0,0 @@
-const process = require('process')
-const { URL } = require('url')
-
-const resolveConfig = require('@netlify/config')
-const { flags: flagsLib } = require('@oclif/command')
-const oclifParser = require('@oclif/parser')
-const merge = require('lodash/merge')
-
-// TODO: use static `import` after migrating this repository to pure ES modules
-const jsClient = import('netlify')
-
-const { getAgent } = require('../lib/http-agent')
-
-const { argv, chalk, error, exit, getCwd, getToken, log, normalizeConfig, pollForToken } = require('./command-helpers')
-const getGlobalConfig = require('./get-global-config')
-const { openBrowser } = require('./open-browser')
-const StateConfig = require('./state-config')
-const { identify, track } = require('./telemetry')
-const { TrackedCommand } = require('./telemetry/tracked-command')
-
-const { NETLIFY_API_URL } = process.env
-
-// Netlify CLI client id. Lives in bot@netlify.com
-// Todo setup client for multiple environments
-const CLIENT_ID = 'd6f37de6614df7ae58664cfca524744d73807a377f5ee71f1a254f78412e3750'
-
-class BaseCommand extends TrackedCommand {
-  // Initialize context
-  async init() {
-    await super.init()
-
-    const cwd = getCwd()
-
-    const [token] = await getToken()
-
-    // Get site id & build state
-    const state = new StateConfig(cwd)
-
-    const apiUrlOpts = {
-      userAgent: this.config.userAgent,
-    }
-
-    if (NETLIFY_API_URL) {
-      const apiUrl = new URL(NETLIFY_API_URL)
-      apiUrlOpts.scheme = apiUrl.protocol.slice(0, -1)
-      apiUrlOpts.host = apiUrl.host
-      apiUrlOpts.pathPrefix = NETLIFY_API_URL === `${apiUrl.protocol}//${apiUrl.host}` ? '/api/v1' : apiUrl.pathname
-    }
-
-    const cachedConfig = await this.getConfig({ cwd, state, token, ...apiUrlOpts })
-    const { buildDir, config, configPath, repositoryRoot, siteInfo } = cachedConfig
-    const normalizedConfig = normalizeConfig(config)
-
-    const { flags } = this.parse(BaseCommand)
-    const agent = await getAgent({
-      httpProxy: flags.httpProxy,
-      certificateFile: flags.httpProxyCertificateFilename,
-    })
-    const apiOpts = { ...apiUrlOpts, agent }
-    const globalConfig = await getGlobalConfig()
-
-    const { NetlifyAPI } = await jsClient
-    this.netlify = {
-      // api methods
-      api: new NetlifyAPI(token || '', apiOpts),
-      repositoryRoot,
-      // current site context
-      site: {
-        root: buildDir,
-        configPath,
-        get id() {
-          return state.get('siteId')
-        },
-        set id(id) {
-          state.set('siteId', id)
-        },
-      },
-      // Site information retrieved using the API
-      siteInfo,
-      // Configuration from netlify.[toml/yml]
-      config: normalizedConfig,
-      // Used to avoid calling @netlify/config again
-      cachedConfig,
-      // global cli config
-      globalConfig,
-      // state of current site dir
-      state,
-    }
-  }
-
-  // Find and resolve the Netlify configuration
-  async getConfig({ cwd, host, offline = argv.offline || argv.o, pathPrefix, scheme, state, token }) {
-    try {
-      return await resolveConfig({
-        config: argv.config,
-        cwd,
-        context: argv.context || this.commandContext,
-        debug: argv.debug,
-        siteId: argv.siteId || (typeof argv.site === 'string' && argv.site) || state.get('siteId'),
-        token,
-        mode: 'cli',
-        host,
-        pathPrefix,
-        scheme,
-        offline,
-      })
-    } catch (error_) {
-      const isUserError = error_.customErrorInfo !== undefined && error_.customErrorInfo.type === 'resolveConfig'
-
-      // If we're failing due to an error thrown by us, it might be because the token we're using is invalid.
-      // To account for that, we try to retrieve the config again, this time without a token, to avoid making
-      // any API calls.
-      //
-      // @todo Replace this with a mechanism for calling `resolveConfig` with more granularity (i.e. having
-      // the option to say that we don't need API data.)
-      if (isUserError && !offline && token) {
-        return this.getConfig({ cwd, offline: true, state, token })
-      }
-
-      const message = isUserError ? error_.message : error_.stack
-      console.error(message)
-      exit(1)
-    }
-  }
-
-  async isLoggedIn() {
-    try {
-      await this.netlify.api.getCurrentUser()
-      return true
-    } catch {
-      return false
-    }
-  }
-
-  /* Modified flag parser to support global --auth, --json, & --silent flags */
-  parse(opts, args = this.argv) {
-    /* Set flags object for commands without flags */
-    if (!opts.flags) {
-      opts.flags = {}
-    }
-    /* enrich parse with global flags */
-    const globalFlags = {}
-    if (!opts.flags.silent) {
-      globalFlags.silent = {
-        parse: (value) => value,
-        description: 'Silence CLI output',
-        allowNo: false,
-        type: 'boolean',
-      }
-    }
-    if (!opts.flags.json) {
-      globalFlags.json = {
-        parse: (value) => value,
-        description: 'Output return values as JSON',
-        allowNo: false,
-        type: 'boolean',
-      }
-    }
-    if (!opts.flags.auth) {
-      globalFlags.auth = {
-        parse: (value) => value,
-        description: 'Netlify auth token',
-        input: [],
-        multiple: false,
-        type: 'option',
-      }
-    }
-
-    // enrich with flags here
-    opts.flags = { ...opts.flags, ...globalFlags }
-
-    return oclifParser.parse(args, {
-      context: this,
-      ...opts,
-    })
-  }
-
-  async authenticate(tokenFromFlag) {
-    const [token] = await getToken(tokenFromFlag)
-    if (token) {
-      return token
-    }
-    return this.expensivelyAuthenticate()
-  }
-
-  async expensivelyAuthenticate() {
-    const webUI = process.env.NETLIFY_WEB_UI || 'https://app.netlify.com'
-    log(`Logging into your Netlify account...`)
-
-    // Create ticket for auth
-    const ticket = await this.netlify.api.createTicket({
-      clientId: CLIENT_ID,
-    })
-
-    // Open browser for authentication
-    const authLink = `${webUI}/authorize?response_type=ticket&ticket=${ticket.id}`
-
-    log(`Opening ${authLink}`)
-    await openBrowser({ url: authLink })
-
-    const accessToken = await pollForToken({
-      api: this.netlify.api,
-      ticket,
-      exitWithError: error,
-    })
-
-    const { email, full_name: name, id: userId } = await this.netlify.api.getCurrentUser()
-
-    const userData = merge(this.netlify.globalConfig.get(`users.${userId}`), {
-      id: userId,
-      name,
-      email,
-      auth: {
-        token: accessToken,
-        github: {
-          user: undefined,
-          token: undefined,
-        },
-      },
-    })
-    // Set current userId
-    this.netlify.globalConfig.set('userId', userId)
-    // Set user data
-    this.netlify.globalConfig.set(`users.${userId}`, userData)
-
-    await identify({
-      name,
-      email,
-      userId,
-    })
-    await track('user_login', {
-      email,
-    })
-
-    // Log success
-    log()
-    log(`${chalk.greenBright('You are now logged into your Netlify account!')}`)
-    log()
-    log(`Run ${chalk.cyanBright('netlify status')} for account details`)
-    log()
-    log(`To see all available commands run: ${chalk.cyanBright('netlify help')}`)
-    log()
-    return accessToken
-  }
-}
-
-BaseCommand.strict = false
-BaseCommand.flags = {
-  debug: flagsLib.boolean({
-    description: 'Print debugging information',
-  }),
-  httpProxy: flagsLib.string({
-    description: 'Proxy server address to route requests through.',
-    default: process.env.HTTP_PROXY || process.env.HTTPS_PROXY,
-  }),
-  httpProxyCertificateFilename: flagsLib.string({
-    description: 'Certificate file to use when connecting using a proxy server',
-    default: process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME,
-  }),
-}
-
-module.exports = BaseCommand

package/src/utils/detect-functions-builder.js

@@ -1,25 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-const detectFunctionsBuilder = async function (parameters) {
-  const buildersPath = path.join(__dirname, '..', 'lib', 'functions', 'runtimes', 'js', 'builders')
-  const detectors = fs
-    .readdirSync(buildersPath)
-    // only accept .js detector files
-    .filter((filename) => filename.endsWith('.js'))
-    // Sorting by filename
-    .sort()
-    // eslint-disable-next-line node/global-require, import/no-dynamic-require
-    .map((det) => require(path.join(buildersPath, det)))
-
-  // eslint-disable-next-line fp/no-loops
-  for (const detector of detectors) {
-    // eslint-disable-next-line no-await-in-loop
-    const settings = await detector(parameters)
-    if (settings) {
-      return settings
-    }
-  }
-}
-
-module.exports = { detectFunctionsBuilder }

package/src/utils/difference.js

@@ -1,4 +0,0 @@
-// Returns a new set with all elements of `setA` that don't exist in `setB`.
-const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
-
-module.exports = { difference }

package/src/utils/logo.js

@@ -1,11 +0,0 @@
-const chalk = require('chalk')
-
-// eslint-disable-next-line no-magic-numbers
-const NETLIFY_CYAN = chalk.rgb(40, 180, 170)
-
-module.exports = {
-  NETLIFYDEV: `${chalk.greenBright('◈')} ${NETLIFY_CYAN('Netlify Dev')} ${chalk.greenBright('◈')}`,
-  NETLIFYDEVLOG: `${chalk.greenBright('◈')}`,
-  NETLIFYDEVWARN: `${chalk.yellowBright('◈')}`,
-  NETLIFYDEVERR: `${chalk.redBright('◈')}`,
-}

package/src/utils/show-help.js

@@ -1,5 +0,0 @@
-const { execSync } = require('child_process')
-
-module.exports = function showHelp(command) {
-  execSync(`netlify ${command} --help`, { stdio: [0, 1, 2] })
-}

package/src/utils/telemetry/tracked-command.js

@@ -1,51 +0,0 @@
-const { hrtime } = require('process')
-
-const { Command } = require('@oclif/command')
-const { ExitError } = require('@oclif/errors')
-
-const { track } = require('.')
-
-const NANO_SECS_TO_MSECS = 1e6
-
-const getDuration = function (startTime) {
-  const durationNs = hrtime.bigint() - startTime
-  return Math.round(Number(durationNs / BigInt(NANO_SECS_TO_MSECS)))
-}
-
-const isSafeError = function (error) {
-  // The `exit` oclif utility returns an ExitError even when the exit code is 0
-  return error instanceof ExitError && error.oclif && error.oclif.exit === 0
-}
-
-const getStatus = function (error) {
-  if (error === undefined || isSafeError(error)) {
-    return 'success'
-  }
-
-  return 'error'
-}
-
-class TrackedCommand extends Command {
-  async init() {
-    this.analytics = { startTime: hrtime.bigint() }
-    await super.init()
-  }
-
-  setAnalyticsPayload(payload) {
-    this.analytics = { ...this.analytics, payload }
-  }
-
-  async finally(error) {
-    const { payload, startTime } = this.analytics
-    const duration = getDuration(startTime)
-    const status = getStatus(error)
-    await track('command', {
-      ...payload,
-      command: this.id,
-      duration,
-      status,
-    })
-  }
-}
-
-module.exports = { TrackedCommand }