Includes a patch to revert an upstream commit in order to get yarn to fetch packages without errors. Also, use the more correct forceFetchGit=true rather than leaveDotGit=true to fetch sources from github using the git protocol (needed to get tests, which aren't present in the tarball). leaveDotGit is not fully deterministic and this was causing sha256 mismatches for some people. Fixes #201763
52 lines
2 KiB
Diff
52 lines
2 KiB
Diff
From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001
|
|
From: Graham Bennett <graham@grahambennett.org>
|
|
Date: Mon, 21 Nov 2022 15:39:54 +0000
|
|
Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)"
|
|
|
|
This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7.
|
|
---
|
|
airflow/www/package.json | 3 ---
|
|
airflow/www/yarn.lock | 13 +++++++++----
|
|
2 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/airflow/www/package.json b/airflow/www/package.json
|
|
index f694089ee6..3d37ad4c46 100644
|
|
--- a/airflow/www/package.json
|
|
+++ b/airflow/www/package.json
|
|
@@ -120,8 +120,5 @@
|
|
"redoc": "^2.0.0-rc.72",
|
|
"type-fest": "^2.17.0",
|
|
"url-search-params-polyfill": "^8.1.0"
|
|
- },
|
|
- "resolutions": {
|
|
- "d3-color": "^3.1.0"
|
|
}
|
|
}
|
|
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
|
|
index bafd63a368..dad0ebabab 100644
|
|
--- a/airflow/www/yarn.lock
|
|
+++ b/airflow/www/yarn.lock
|
|
@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4:
|
|
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
|
|
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
|
|
|
|
-d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0:
|
|
- version "3.1.0"
|
|
- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
|
|
- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
|
|
+d3-color@1:
|
|
+ version "1.4.1"
|
|
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
|
|
+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
|
|
+
|
|
+"d3-color@1 - 2":
|
|
+ version "2.0.0"
|
|
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
|
|
+ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
|
|
|
|
d3-contour@1:
|
|
version "1.3.2"
|
|
--
|
|
2.37.3
|
|
|