Update Config parsing to work with netlify build

package.json

@@ -62,7 +62,7 @@
   "dependencies": {
     "@iarna/toml": "^2.2.3",
     "@netlify/build": "^0.1.7",
-    "@netlify/config": "^0.1.1",
+    "@netlify/config": "^0.1.7",
     "@netlify/zip-it-and-ship-it": "^0.3.1",
     "@oclif/command": "^1.5.18",
     "@oclif/config": "^1.13.2",

src/commands/build/index.js

@@ -7,6 +7,11 @@ const { parseRawFlags } = require('../../utils/parse-raw-flags')
 class BuildCommand extends Command {
   // Run Netlify Build
   async run() {
+    /*
+      @TODO remove this.getOptions() & use the parsed config from Command.
+      this.netlify.config contains resolved config via @netlify/config
+      @netlify/build currently takes a path to config and resolves config values again
+    */
     const options = await this.getOptions()
 
     await this.config.runHook('analytics', {
@@ -21,14 +26,23 @@ class BuildCommand extends Command {
 
   // Retrieve Netlify Build options
   async getOptions() {
+    const { site } = this.netlify
     const { raw } = this.parse(BuildCommand)
     const { dry = false } = parseRawFlags(raw)
     const [token] = this.getConfigToken()
 
     // Try current directory first, then site root
     const config = (await getConfigPath()) || (await getConfigPath(undefined, this.netlify.site.root))
 
-    return { config, token, dry }
+    let options = {
+      config,
+      token,
+      dry
+    }
+    if (site.id) {
+      options.siteId = site.id
+    }
+    return options
   }
 }
 

src/commands/dev/exec.js

@@ -5,7 +5,7 @@ const {
   NETLIFYDEVLOG,
   // NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('../../utils/logo')
 
 class ExecCommand extends Command {
   async run() {

src/commands/dev/index.js

@@ -25,7 +25,7 @@ const {
   NETLIFYDEVLOG,
   NETLIFYDEVWARN
   // NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('../../utils/logo')
 const boxen = require('boxen')
 const { createTunnel, connectTunnel } = require('../../utils/live-tunnel')
 const createRewriter = require('../../utils/rules-proxy')

src/commands/functions/build.js

@@ -7,7 +7,7 @@ const {
   NETLIFYDEVLOG,
   // NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('../../utils/logo')
 
 class FunctionsBuildCommand extends Command {
   async run() {

src/commands/functions/create.js

@@ -16,7 +16,7 @@ const {
   NETLIFYDEVLOG,
   NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('../../utils/logo')
 
 const templatesDir = path.resolve(__dirname, '../../functions-templates')
 

src/detectors/utils/jsdetect.js

@@ -7,7 +7,7 @@ const { existsSync, readFileSync } = require('fs')
 let pkgJSON = null
 let yarnExists = false
 let warnedAboutEmptyScript = false
-const { NETLIFYDEVWARN } = require('netlify-cli-logo')
+const { NETLIFYDEVWARN } = require('../../utils/logo')
 
 /** hold package.json in a singleton so we dont do expensive parsing repeatedly */
 function getPkgJSON() {

src/utils/command.js

@@ -9,8 +9,8 @@ const StateConfig = require('./state-config')
 const globalConfig = require('./global-config')
 const findRoot = require('./find-root')
 const chalkInstance = require('./chalk')
-const readConfig = require('./read-config')
-const getConfigPath = require('./get-config-path')
+const resolveConfig = require('@netlify/config')
+const getConfigPath = require('@netlify/config').getConfigPath
 
 const argv = require('minimist')(process.argv.slice(2))
 const { NETLIFY_AUTH_TOKEN, NETLIFY_API_URL } = process.env
@@ -25,16 +25,28 @@ class BaseCommand extends Command {
   }
   // Initialize context
   async init(_projectRoot) {
-    const projectRoot = findRoot(_projectRoot || process.cwd()) // if calling programmatically, can use a supplied root, else in normal CLI context it just uses process.cwd()
+    const cwd = argv.cwd || process.cwd()
+    const projectRoot = findRoot(_projectRoot || cwd) // if calling programmatically, can use a supplied root, else in normal CLI context it just uses process.cwd()
     // Grab netlify API token
     const authViaFlag = getAuthArg(argv)
 
     const [token] = this.getConfigToken(authViaFlag)
-    // Get site config from netlify.toml
-    const configPath = getConfigPath(projectRoot)
-    // TODO: https://github.com/request/caseless to handle key casing issues
-    const config = readConfig(configPath)
 
+    // Read new netlify.toml/yml/json
+    let configPath
+    let config = {}
+    try {
+      configPath = await getConfigPath(argv.config, cwd)
+      config = await resolveConfig(configPath, {
+        cwd: cwd,
+        context: argv.context
+      })
+    } catch (err) {
+      // Suppress config not found error for CLI. @TODO Revisit
+      if (err.message.indexOf('No netlify configuration file was found') === -1) {
+        throw err
+      }
+    }
     // Get site id & build state
     const state = new StateConfig(projectRoot)
 

src/utils/detect-functions-builder.js

@@ -1,11 +1,11 @@
 const path = require('path')
 
-const detectors = require('fs')
-  .readdirSync(path.join(__dirname, '..', 'function-builder-detectors'))
-  .filter(x => x.endsWith('.js')) // only accept .js detector files
-  .map(det => require(path.join(__dirname, '..', `function-builder-detectors/${det}`)))
-
 module.exports.detectFunctionsBuilder = function() {
+  const detectors = require('fs')
+    .readdirSync(path.join(__dirname, '..', 'function-builder-detectors'))
+    .filter(x => x.endsWith('.js')) // only accept .js detector files
+    .map(det => require(path.join(__dirname, '..', `function-builder-detectors/${det}`)))
+
   for (const i in detectors) {
     const settings = detectors[i]()
     if (settings) {

src/utils/detect-server.js

@@ -1,28 +1,28 @@
 const path = require('path')
 const chalk = require('chalk')
-const { NETLIFYDEVLOG } = require('netlify-cli-logo')
+const { NETLIFYDEVLOG } = require('./logo')
 const inquirer = require('inquirer')
 const fuzzy = require('fuzzy')
 const fs = require('fs')
-const detectors = fs
-  .readdirSync(path.join(__dirname, '..', 'detectors'))
-  .filter(x => x.endsWith('.js')) // only accept .js detector files
-  .map(det => {
-    try {
-      return require(path.join(__dirname, '..', `detectors/${det}`))
-    } catch (err) {
-      console.error(
-        `failed to load detector: ${chalk.yellow(
-          det
-        )}, this is likely a bug in the detector, please file an issue in netlify-dev-plugin`,
-        err
-      )
-      return null
-    }
-  })
-  .filter(Boolean)
 
 module.exports.serverSettings = async devConfig => {
+  const detectors = fs
+    .readdirSync(path.join(__dirname, '..', 'detectors'))
+    .filter(x => x.endsWith('.js')) // only accept .js detector files
+    .map(det => {
+      try {
+        return require(path.join(__dirname, '..', `detectors/${det}`))
+      } catch (err) {
+        console.error(
+          `failed to load detector: ${chalk.yellow(
+            det
+          )}, this is likely a bug in the detector, please file an issue in netlify-dev-plugin`,
+          err
+        )
+        return null
+      }
+    })
+    .filter(Boolean)
   let settingsArr = []
   let settings = null
   for (const i in detectors) {

src/utils/dev.js

@@ -8,7 +8,7 @@ const {
   NETLIFYDEVLOG,
   // NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('./logo')
 /**
  * inject environment variables from netlify addons and buildbot
  * into your local dev process.env

src/utils/init/config-github.js

@@ -49,8 +49,12 @@ async function configGithub(ctx, site, repo) {
   let defaultBuildCmd,
     defaultBuildDir = '.'
   const { build } = ctx.netlify.config // read from netlify toml
-  if (build && build.command) defaultBuildCmd = build.command
-  if (build && build.publish) defaultBuildDir = build.publish
+  if (build && build.command) {
+    defaultBuildCmd = build.command
+  }
+  if (build && build.publish) {
+    defaultBuildDir = build.publish
+  }
   if (build && build.functions) console.log('Netlify functions folder is ' + chalk.yellow(build.functions))
   const { buildCmd, buildDir } = await inquirer.prompt([
     {

src/utils/live-tunnel.js

@@ -9,7 +9,7 @@ const {
   NETLIFYDEVLOG,
   // NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('./logo')
 
 async function createTunnel(siteId, netlifyApiToken, log) {
   await installTunnelClient(log)

src/utils/logo.js

@@ -0,0 +1,8 @@
+const chalk = require("chalk")
+
+module.exports = {
+  NETLIFYDEV: `${chalk.greenBright("◈")} ${chalk.rgb(40, 180, 170)("Netlify Dev")} ${chalk.greenBright("◈")}`,
+  NETLIFYDEVLOG: `${chalk.greenBright("◈")}`,
+  NETLIFYDEVWARN: `${chalk.yellowBright("◈")}`,
+  NETLIFYDEVERR: `${chalk.redBright("◈")}`
+}

src/utils/serve-functions.js

@@ -9,7 +9,7 @@ const {
   NETLIFYDEVLOG,
   // NETLIFYDEVWARN,
   NETLIFYDEVERR
-} = require('netlify-cli-logo')
+} = require('./logo')
 const { getFunctions } = require('./get-functions')
 
 const defaultPort = 34567