From f8b191e13e3828c628a00b7409e63415c903c3fc Mon Sep 17 00:00:00 2001
From: Nick Lynch <nlynch@amazon.com>
Date: Tue, 1 Jun 2021 14:56:25 +0100
Subject: [PATCH] chore: move check-yarn-lock to build.sh (#14938)

Having this check in the prebuild is causing issues with the way we set up
GitPod integration. Our build step actually does install as well, so our build
is really a build+install, so it makes sense to do the check here anyway.

fixes #14896


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 build.sh     | 3 +++
 package.json | 1 -
 yarn.lock    | 9 ++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 14d8c27935405..3f1e425cf1095 100755
--- a/build.sh
+++ b/build.sh
@@ -59,6 +59,9 @@ if [ "$check_prereqs" == "true" ]; then
   /bin/bash ./scripts/check-build-prerequisites.sh
 fi
 
+# Check that the yarn.lock is consistent
+node ./scripts/check-yarn-lock.js
+
 # Prepare for build with references
 /bin/bash scripts/generate-aggregate-tsconfig.sh > tsconfig.json
 
diff --git a/package.json b/package.json
index 088c4705b123d..a465b3f433d86 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
   },
   "scripts": {
     "pkglint": "lerna --scope pkglint run build && lerna run pkglint",
-    "prebuild": "node ./scripts/check-yarn-lock.js",
     "build": "./build.sh",
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
diff --git a/yarn.lock b/yarn.lock
index 45a920fd274cf..60b0cc2629c51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1553,6 +1553,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/fs-extra@^9.0.11":
+  version "9.0.11"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"
+  integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob@*", "@types/glob@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
@@ -3157,7 +3164,7 @@ conventional-commits-filter@^2.0.7:
     lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.2.0:
+conventional-commits-parser@^3.2.0, conventional-commits-parser@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz#ba44f0b3b6588da2ee9fd8da508ebff50d116ce2"
   integrity sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA==