From d8b53be2e07cd28f5d8219c87de04830272b8a4f Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Thu, 9 Mar 2023 16:12:00 +0100
Subject: [PATCH] Update workflows and scripts

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 .eslintignore                                          |  1 -
 .github/workflows/deploy_microsite.yml                 | 10 +++++-----
 ...{verify_microsite-next.yml => verify_microsite.yml} | 10 +++++-----
 scripts/verify-lockfile-duplicates.js                  |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename .github/workflows/{verify_microsite-next.yml => verify_microsite.yml} (85%)

diff --git a/.eslintignore b/.eslintignore
index 51a1ecb9a4..46bb1ad2b2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,6 +7,5 @@
 **/.git/**
 **/public/**
 **/microsite/**
-**/microsite-next/**
 **/templates/**
 **/sample-templates/**
diff --git a/.github/workflows/deploy_microsite.yml b/.github/workflows/deploy_microsite.yml
index b25dd90b84..2c86ebf0b4 100644
--- a/.github/workflows/deploy_microsite.yml
+++ b/.github/workflows/deploy_microsite.yml
@@ -33,7 +33,7 @@ jobs:
         run: yarn install --immutable
       - name: microsite yarn install
         run: yarn install --immutable
-        working-directory: microsite-next
+        working-directory: microsite
       - name: storybook yarn install
         run: yarn install --immutable
         working-directory: storybook
@@ -43,20 +43,20 @@ jobs:
 
       - name: build microsite
         run: yarn build
-        working-directory: microsite-next
+        working-directory: microsite
 
       - name: build storybook
         run: yarn build-storybook
         working-directory: storybook
 
       - name: move storybook dist into microsite
-        run: mv storybook/dist/ microsite-next/build/storybook
+        run: mv storybook/dist/ microsite/build/storybook
 
       - name: Check the build output
-        run: ls microsite-next/build && ls microsite-next/build/storybook
+        run: ls microsite/build && ls microsite/build/storybook
 
       - name: Deploy both microsite and storybook to gh-pages
         uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           branch: gh-pages
-          folder: microsite-next/build
+          folder: microsite/build
diff --git a/.github/workflows/verify_microsite-next.yml b/.github/workflows/verify_microsite.yml
similarity index 85%
rename from .github/workflows/verify_microsite-next.yml
rename to .github/workflows/verify_microsite.yml
index 7db5f102a9..adc2f18e26 100644
--- a/.github/workflows/verify_microsite-next.yml
+++ b/.github/workflows/verify_microsite.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/verify_microsite-next.yml'
-      - 'microsite-next/**'
+      - 'microsite/**'
       - 'docs/**'
 
 jobs:
@@ -34,7 +34,7 @@ jobs:
 
       - name: yarn install
         run: yarn install --immutable
-        working-directory: microsite-next
+        working-directory: microsite
 
       - name: build API reference
         run: yarn build:api-docs
@@ -44,8 +44,8 @@ jobs:
 
       - name: prettier
         run: yarn prettier:check
-        working-directory: microsite-next
+        working-directory: microsite
 
-      - name: build microsite-next
+      - name: build microsite
         run: yarn build
-        working-directory: microsite-next
+        working-directory: microsite
diff --git a/scripts/verify-lockfile-duplicates.js b/scripts/verify-lockfile-duplicates.js
index c1e985955a..a8d344b741 100644
--- a/scripts/verify-lockfile-duplicates.js
+++ b/scripts/verify-lockfile-duplicates.js
@@ -36,7 +36,7 @@ async function findLockFiles() {
 
   if (!files.length) {
     // List all lock files that are in the root or in an immediate subdirectory
-    files = ['yarn.lock', 'cypress/yarn.lock', 'microsite-next/yarn.lock'];
+    files = ['yarn.lock', 'cypress/yarn.lock', 'microsite/yarn.lock'];
   }
 
   return files.map(file => ({