From c6d57f9be363a974f78820ec6d1ab0d3353bc1f6 Mon Sep 17 00:00:00 2001
From: Katrina Verey <katrina.verey@shopify.com>
Date: Thu, 28 Jul 2022 20:56:08 -0400
Subject: [PATCH 1/2] Update netlify config

---
 netlify.toml           | 10 ----------
 site/config.toml       |  2 +-
 site/netlify.toml      | 19 ++++++++++++++++++-
 site/package-lock.json |  2 +-
 site/package.json      |  2 +-
 5 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100644 netlify.toml

diff --git a/netlify.toml b/netlify.toml
deleted file mode 100644
index 16c70c2991..0000000000
--- a/netlify.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[build]
-  base = "site/"
-  command = "hugo"
-  publish = "../publishedSite"
-
-[context.production.environment]
-  HUGO_VERSION = "0.92.2"
-
-[context.deploy-preview.environment]
-  HUGO_VERSION = "0.92.2"
diff --git a/site/config.toml b/site/config.toml
index f1cb8f8003..35aa0650d5 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -1,7 +1,7 @@
 baseURL = "https://kustomize.io"
 title = "Kustomize"
 
-publishDir = "../publishedSite"
+publishDir = "publishedSite"
 
 # Language settings
 contentDir = "content/en"
diff --git a/site/netlify.toml b/site/netlify.toml
index 0e94ebabd0..289060e800 100644
--- a/site/netlify.toml
+++ b/site/netlify.toml
@@ -1,3 +1,20 @@
 [build]
+  base = "site/"
+  command = "git submodule update --init --recursive --depth 1 && hugo"
+  publish = "publishedSite/"
+  ignore = "exit 1"
+
 [build.environment]
-HUGO_VERSION = "0.88.1"
+  HUGO_VERSION = "0.92.2"
+  NODE_ENV = "development"
+  NETLIFY_BUILD_DEBUG = "true"
+
+[context.deploy-preview]
+  command = "git submodule update --init --recursive --depth 1 && hugo --enableGitInfo --buildFuture -b $DEPLOY_PRIME_URL"
+
+[context.branch-deploy]
+  ignore = "exit 0" # build PRs (deploy preview env) only, not all branches
+
+[context.production]
+  ignore = "exit 0" # never deploy production until we're ready to launch
+
diff --git a/site/package-lock.json b/site/package-lock.json
index a32d1220cd..15eff60f00 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -11,7 +11,7 @@
       "devDependencies": {
         "autoprefixer": "^10.4.2",
         "postcss": "^8.4.8",
-        "postcss-cli": "^9.0.2"
+        "postcss-cli": "^9.1.0"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
diff --git a/site/package.json b/site/package.json
index 7abe34f2fd..cd2ebb2973 100644
--- a/site/package.json
+++ b/site/package.json
@@ -19,6 +19,6 @@
   "devDependencies": {
     "autoprefixer": "^10.4.2",
     "postcss": "^8.4.8",
-    "postcss-cli": "^9.0.2"
+    "postcss-cli": "^9.1.0"
   }
 }

From a2d25fac4324ebf75690ea03c86cbfcefa0c4255 Mon Sep 17 00:00:00 2001
From: Katrina Verey <kn.verey@gmail.com>
Date: Fri, 29 Jul 2022 15:04:46 -0400
Subject: [PATCH 2/2] Update site/netlify.toml

---
 site/netlify.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/netlify.toml b/site/netlify.toml
index 289060e800..a2ad21f217 100644
--- a/site/netlify.toml
+++ b/site/netlify.toml
@@ -2,7 +2,6 @@
   base = "site/"
   command = "git submodule update --init --recursive --depth 1 && hugo"
   publish = "publishedSite/"
-  ignore = "exit 1"
 
 [build.environment]
   HUGO_VERSION = "0.92.2"