Improve how the project root is resolved (#953)

* Improve how projectRoot is computed

* Upgrade dependencies

package.json

@@ -63,9 +63,9 @@
     "postinstall": "node ./scripts/postinstall.js"
   },
   "dependencies": {
-    "@netlify/build": "^2.0.20",
-    "@netlify/config": "^1.2.5",
-    "@netlify/zip-it-and-ship-it": "^1.3.1",
+    "@netlify/build": "^2.0.26",
+    "@netlify/config": "^2.0.3",
+    "@netlify/zip-it-and-ship-it": "^1.3.2",
     "@oclif/command": "^1.5.18",
     "@oclif/config": "^1.13.2",
     "@oclif/errors": "^1.1.2",
@@ -122,7 +122,7 @@
     "make-dir": "^3.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
-    "netlify": "^4.3.3",
+    "netlify": "^4.3.5",
     "netlify-redirect-parser": "^2.5.0",
     "netlify-redirector": "^0.2.0",
     "node-fetch": "^2.6.0",

src/utils/command.js

@@ -7,7 +7,6 @@ const { track, identify } = require('./telemetry')
 const openBrowser = require('./open-browser')
 const StateConfig = require('./state-config')
 const globalConfig = require('./global-config')
-const findRoot = require('./find-root')
 const chalkInstance = require('./chalk')
 const resolveConfig = require('@netlify/config')
 
@@ -23,19 +22,18 @@ class BaseCommand extends Command {
     super(...args)
   }
   // Initialize context
-  async init(_projectRoot) {
+  async init() {
     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 id & build state
-    const state = new StateConfig(projectRoot)
+    const state = new StateConfig(cwd)
 
-    const cachedConfig = await this.getConfig(cwd, projectRoot, state, token)
-    const { configPath, config } = cachedConfig
+    const cachedConfig = await this.getConfig(cwd, state, token)
+    const { configPath, config, buildDir } = cachedConfig
 
     const apiOpts = {}
     if (NETLIFY_API_URL) {
@@ -50,7 +48,7 @@ class BaseCommand extends Command {
       api: new API(token || '', apiOpts),
       // current site context
       site: {
-        root: projectRoot,
+        root: buildDir,
         configPath: configPath,
         get id() {
           return state.get('siteId')
@@ -71,12 +69,11 @@ class BaseCommand extends Command {
   }
 
   // Find and resolve the Netlify configuration
-  async getConfig(cwd, projectRoot, state, token) {
+  async getConfig(cwd, state, token) {
     try {
       return await resolveConfig({
         config: argv.config,
         cwd: cwd,
-        repositoryRoot: projectRoot,
         context: argv.context,
         debug: argv.debug,
         siteId: state.get('siteId'),

src/utils/state-config.js

@@ -1,16 +1,27 @@
 const path = require('path')
+const findUp = require('find-up')
 const makeDir = require('make-dir')
 const fs = require('fs')
 const writeFileAtomic = require('write-file-atomic')
 const dotProp = require('dot-prop')
 
-const statePath = path.join('.netlify', 'state.json')
+const STATE_PATH = path.join('.netlify', 'state.json')
 const permissionError = "You don't have access to this file."
 
 class StateConfig {
-  constructor(projectRoot) {
-    this.root = projectRoot
-    this.path = path.join(projectRoot, statePath)
+  constructor(cwd) {
+    this.path = this.findStatePath(cwd)
+  }
+
+  // Finds location of `.netlify/state.json`
+  findStatePath(cwd) {
+    const statePath = findUp.sync([STATE_PATH], { cwd })
+
+    if (!statePath) {
+      return path.join(cwd, STATE_PATH)
+    }
+
+    return statePath
   }
 
   get all() {