Improve how projectRoot is computed

package.json

@@ -63,8 +63,8 @@
     "postinstall": "node ./scripts/postinstall.js"
   },
   "dependencies": {
-    "@netlify/build": "^2.0.20",
-    "@netlify/config": "^1.2.5",
+    "@netlify/build": "^2.0.21-1",
+    "@netlify/config": "^1.2.6-1",
     "@netlify/zip-it-and-ship-it": "^1.3.1",
     "@oclif/command": "^1.5.18",
     "@oclif/config": "^1.13.2",

src/utils/command.js

@@ -23,19 +23,19 @@ class BaseCommand extends Command {
     super(...args)
   }
   // Initialize context
-  async init(_projectRoot) {
+  async init(_stateRoot) {
     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()
+    const stateRoot = findRoot(_stateRoot || 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(stateRoot)
 
-    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 +50,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 +71,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,
         siteId: state.get('siteId'),
         token,

src/utils/state-config.js

@@ -8,9 +8,8 @@ const statePath = 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(stateRoot) {
+    this.path = path.join(stateRoot, statePath)
   }
 
   get all() {