From 1832e0f2930cf3a9fb6f401007d2c7476769d6f0 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 20 Feb 2019 07:07:36 -0800
Subject: [PATCH] build: use vendored yarn under Bazel (#28839)

PR Close #28839
---
 .circleci/env.sh                                                | 2 +-
 WORKSPACE                                                       | 2 +-
 third_party/github.com/yarnpkg/yarn/releases/BUILD.bazel        | 2 +-
 .../yarnpkg/yarn/releases/{ => download/v1.13.0}/LICENSE        | 0
 .../releases/{yarn-1.13.0.js => download/v1.13.0/bin/yarn.js}   | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename third_party/github.com/yarnpkg/yarn/releases/{ => download/v1.13.0}/LICENSE (100%)
 rename third_party/github.com/yarnpkg/yarn/releases/{yarn-1.13.0.js => download/v1.13.0/bin/yarn.js} (100%)

diff --git a/.circleci/env.sh b/.circleci/env.sh
index 2de5b8a8bb..ea8772a03b 100755
--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@@ -65,7 +65,7 @@ setPublicVar SAUCE_READY_FILE_TIMEOUT 120
 ####################################################################################################
 # Define our own yarn command for CircleCI.
 ####################################################################################################
-echo "function yarn () { /usr/bin/env node $projectDir/third_party/github.com/yarnpkg/yarn/releases/yarn-1.13.0.js \"\$@\"; }" >> $BASH_ENV;
+echo "function yarn () { /usr/bin/env node $projectDir/third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js \"\$@\"; }" >> $BASH_ENV;
 echo "export -f yarn;" >> $BASH_ENV;
 
 
diff --git a/WORKSPACE b/WORKSPACE
index 214ef7a076..c0a8f312d4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -48,7 +48,7 @@ node_repositories(
     node_version = "10.9.0",
     package_json = ["//:package.json"],
     preserve_symlinks = True,
-    yarn_version = "1.12.1",
+    vendored_yarn = "@angular//third_party/github.com/yarnpkg/yarn/releases/download:v1.13.0",
 )
 
 # Setup the angular toolchain which installs npm dependencies into @ngdeps
diff --git a/third_party/github.com/yarnpkg/yarn/releases/BUILD.bazel b/third_party/github.com/yarnpkg/yarn/releases/BUILD.bazel
index 6c9c672a2b..f6d5e39d78 100644
--- a/third_party/github.com/yarnpkg/yarn/releases/BUILD.bazel
+++ b/third_party/github.com/yarnpkg/yarn/releases/BUILD.bazel
@@ -1,2 +1,2 @@
-# Fetched from https://github.com/yarnpkg/yarn/releases/download/v1.13.0/yarn-1.13.0.js
+# Fetched from https://github.com/yarnpkg/yarn/releases/download/v1.13.0/yarn-v1.13.0.tar.gz
 licenses(["notice"])
diff --git a/third_party/github.com/yarnpkg/yarn/releases/LICENSE b/third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/LICENSE
similarity index 100%
rename from third_party/github.com/yarnpkg/yarn/releases/LICENSE
rename to third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/LICENSE
diff --git a/third_party/github.com/yarnpkg/yarn/releases/yarn-1.13.0.js b/third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js
similarity index 100%
rename from third_party/github.com/yarnpkg/yarn/releases/yarn-1.13.0.js
rename to third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js