mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-01-05 22:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: install specific Node version on Mac before building binary (#8242)

Browse Source
This commit is contained in:
Gleb Bahmutov
2020-08-11 13:14:33 -04:00
committed by GitHub
parent 21748faddc
commit dc523eb390
6 changed files with 184 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
circle.yml
View File

@@ -9,6 +9,7 @@ macBuildFilters: &macBuildFilters
only:
- develop
- v5.0-release
- install-node-on-circleci-mac
defaults: &defaults
parallelism: 1
@@ -60,12 +61,37 @@ executors:
# https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
mac:
macos:
## Node 12.12.0 (yarn 1.19.1)
# Executor should have Node >= required version
xcode: "11.2.1"
environment:
PLATFORM: mac
commands:
install-required-node:
# https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2
description: Install Node version matching .node-version
steps:
- run:
name: Install NVM
# TODO: determine why we get the missing .nvmrc file error
command: |
export NODE_VERSION=$(cat .node-version)
echo "Installing Node $NODE_VERSION"
cp .node-version .nvmrc
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash
- run:
# https://github.com/nvm-sh/nvm#nvmrc
name: Install Node
command: |
. ./scripts/load-nvm.sh
echo "before nvm install"
nvm install
echo "before nvm use"
nvm use
echo "before nvm alias default"
nvm alias default
node --version
install-latest-chrome:
description: Install latest Google Chrome (stable)
parameters:
@@ -367,6 +393,7 @@ jobs:
<<: *defaults
steps:
- checkout
- install-required-node
- run:
name: Print working folder
command: echo $PWD
@@ -375,20 +402,36 @@ jobs:
command: echo $(yarn global bin)
- run:
name: print Node version
command: node -v
command: |
. ./scripts/load-nvm.sh
echo "nvm use default"
nvm use default
node -v
- run:
name: print yarn version
command: yarn -v
- run: yarn check-node-version
- run:
name: check Node version
command: |
. ./scripts/load-nvm.sh
yarn check-node-version
## make sure the TERM is set to 'xterm' in node (Linux only)
## else colors (and tests) will fail
## See the following information
## * http://andykdocs.de/development/Docker/Fixing+the+Docker+TERM+variable+issue
## * https://unix.stackexchange.com/questions/43945/whats-the-difference-between-various-term-variables
- run: yarn check-terminal
- run:
name: Check terminal
command: |
. ./scripts/load-nvm.sh
yarn check-terminal
- run: yarn stop-only-all
- run:
name: Stop .only
command: |
. ./scripts/load-nvm.sh
yarn stop-only-all
- restore_cache:
name: Restore yarn cache
@@ -399,7 +442,11 @@ jobs:
- run: ls $(yarn global bin)/../lib/node_modules
# try several times, because flaky NPM installs ...
- run: yarn --frozen-lockfile || yarn --frozen-lockfile
- run:
name: install and build
command: |
. ./scripts/load-nvm.sh
yarn --frozen-lockfile || yarn --frozen-lockfile
- run:
name: Top level packages
command: yarn list --depth=0 || true
@@ -417,8 +464,13 @@ jobs:
steps:
- attach_workspace:
at: ~/
## this will catch .only's in js/coffee as well
- run: yarn lint
- install-required-node
## this will catch ".only"s in js/coffee as well
- run:
name: Linting 🧹
command: |
. ./scripts/load-nvm.sh
yarn lint
- run:
name: cypress info (dev)
command: node cli/bin/cypress info --dev
@@ -530,10 +582,18 @@ jobs:
steps:
- attach_workspace:
at: ~/
# make sure mocha runs
- run: yarn test-mocha
- install-required-node
- run:
name: Mocha tests
command: |
. ./scripts/load-nvm.sh
yarn test-mocha
# test binary build code
- run: yarn test-scripts
- run:
name: Test scripts
command: |
. ./scripts/load-nvm.sh
yarn test-scripts
server-unit-tests:
<<: *defaults
@@ -969,6 +1029,7 @@ jobs:
- attach_workspace:
at: ~/
- run: $(yarn bin)/print-arch
- install-required-node
- run:
environment:
DEBUG: electron-builder,electron-osx-sign*
@@ -977,8 +1038,15 @@ jobs:
# if this is a forked pull request, the NEXT_DEV_VERSION environment variable
# won't be set and we will use default version, since we are not going to
# upload the dev binary build anywhere
command: yarn binary-build --platform $PLATFORM --version ${NEXT_DEV_VERSION:-0.0.0-development}
- run: yarn binary-zip --platform $PLATFORM
command: |
. ./scripts/load-nvm.sh
node --version
yarn binary-build --platform $PLATFORM --version ${NEXT_DEV_VERSION:-0.0.0-development}
- run:
name: Zip the binary
command: |
. ./scripts/load-nvm.sh
yarn binary-zip --platform $PLATFORM
# Cypress binary file should be zipped to cypress.zip
- run: ls -l *.zip
- store-npm-logs
@@ -1011,6 +1079,7 @@ jobs:
steps:
- clone-repo-and-checkout-release-branch:
repo: cypress-example-kitchensink
- install-required-node
- run:
name: Install prod dependencies
command: yarn --production
@@ -1022,7 +1091,9 @@ jobs:
background: true
- run:
name: Run Kitchensink example project
command: yarn cypress:run --project /tmp/cypress-example-kitchensink
command: |
. ./scripts/load-nvm.sh
yarn cypress:run --project /tmp/cypress-example-kitchensink
- store_artifacts:
path: /tmp/cypress-example-kitchensink/cypress/screenshots
- store_artifacts:
@@ -1072,13 +1143,20 @@ jobs:
steps:
- attach_workspace:
at: ~/
- run: yarn check-next-dev-version
- install-required-node
- run:
name: Check next dev version
command: |
. ./scripts/load-nvm.sh
yarn check-next-dev-version
- run:
name: bump NPM version
command: yarn version --no-git-tag-version --new-version ${NEXT_DEV_VERSION:-0.0.0-development}
- run:
name: build NPM package
command: yarn build --scope cypress
command: |
. ./scripts/load-nvm.sh
yarn build --scope cypress
- run:
command: ls -la types
working_directory: cli/build

3
electron-builder.json
View File

@@ -19,7 +19,8 @@
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/trash/lib/macos-trash",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/fse.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/fsevents/fsevents.node"
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/fsevents/fsevents.node",
"./build/mac/Cypress.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Helpers/chrome_crashpad_handler"
]
},
"linux": {

4
package.json
View File

@@ -121,8 +121,8 @@
"debug": "4.1.1",
"decaffeinate": "6.0.9",
"del": "3.0.0",
"electron-builder": "22.6.1",
"electron-notarize": "0.2.1",
"electron-builder": "22.8.0",
"electron-notarize": "1.0.0",
"enzyme-adapter-react-16": "1.12.1",
"eslint": "6.8.0",
"eslint-plugin-cypress": "2.11.1",

13
scripts/check-node-version.js
View File

@@ -3,23 +3,10 @@ const assert = require('assert')
// TODO make this check a 3rd party little tool
// on CircleCI Mac machine, we need to use on of the laer executors
// that already has Node 10 / 11
const isMac = () => {
return os.platform() === 'darwin'
}
const isWindows = () => {
return os.platform() === 'win32'
}
if (isMac() && process.env.CIRCLECI) {
// eslint-disable-next-line no-console
console.log('Skipping Node version check on CircleCI Mac')
return
}
// if we're windows + in appveyor...
if (isWindows() && process.env.APPVEYOR) {
// check to ensure that the cpuArch + nodeArch are in sync

11
scripts/load-nvm.sh Executable file
View File

@@ -0,0 +1,11 @@
# loads previously installed NVM
# USE:
# - run:
# name: check Node version
# command: |
# . ./scripts/load-nvm.sh
# yarn check-node-version
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
export NODE_VERSION=$(cat .node-version)

142
yarn.lock
View File

@@ -4098,13 +4098,20 @@
resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
integrity sha1-wFTor02d11205jq8dviFFocU1LM=
"@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.0":
"@types/fs-extra@^8.0.1":
version "8.1.1"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
dependencies:
"@types/node" "*"
"@types/fs-extra@^9.0.1":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
integrity sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==
dependencies:
"@types/node" "*"
"@types/glob@7.1.1":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -5297,26 +5304,26 @@ app-builder-bin@3.5.9:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==
app-builder-lib@22.6.1:
version "22.6.1"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.1.tgz#f17bfbde1bbb26ae438e450b66005bf6714feb30"
integrity sha512-ENL7r+H7IBfDb4faeLASgndsXrAT7AV7m7yJjcpbFDXYma6an7ZWGFIvR0HJrsfiC5TIB8kdLJ/aMSImrrSi/Q==
app-builder-lib@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.8.0.tgz#342a8976f50ae35cfd07412dbfd4f6c895b32eac"
integrity sha512-RGaIRjCUrqkmh6QOGsyekQPEOaVynHfmeh8JZuyUymFYUOFdzBbPamkA2nhBVBTkkgfjRHsxK7LhedFKPzvWEQ==
dependencies:
"7zip-bin" "~5.0.3"
"@develar/schema-utils" "~2.6.5"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
builder-util "22.6.1"
builder-util-runtime "8.7.0"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chromium-pickle-js "^0.2.0"
debug "^4.1.1"
ejs "^3.1.2"
electron-publish "22.6.1"
fs-extra "^9.0.0"
hosted-git-info "^3.0.4"
ejs "^3.1.3"
electron-publish "22.8.0"
fs-extra "^9.0.1"
hosted-git-info "^3.0.5"
is-ci "^2.0.0"
isbinaryfile "^4.0.6"
js-yaml "^3.13.1"
js-yaml "^3.14.0"
lazy-val "^1.0.4"
minimatch "^3.0.4"
normalize-package-data "^2.5.0"
@@ -7686,30 +7693,30 @@ buffer@~5.2.1:
base64-js "^1.0.2"
ieee754 "^1.1.4"
builder-util-runtime@8.7.0:
version "8.7.0"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d"
integrity sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg==
builder-util-runtime@8.7.2:
version "8.7.2"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
dependencies:
debug "^4.1.1"
sax "^1.2.4"
builder-util@22.6.1:
version "22.6.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.1.tgz#78172c3634da460325277ef798994592e595eff3"
integrity sha512-A9cF+bSHqRTSKIUHEyE92Tl0Uh12N7yZRH9bccIL3gRUwtp6ulF28LsjNIWTSQ1clZo2M895cT5PCrKzjPQFVg==
builder-util@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.8.0.tgz#01684085d1f2370b1bd182f69cbd007426f63f64"
integrity sha512-H80P1JzVy3TGpi63x81epQDK24XalL034+jAZlrPb5IhLtYmnNNdxCCAVJvg3VjSISd73Y71O+uhqCxWpqbPHw==
dependencies:
"7zip-bin" "~5.0.3"
"@types/debug" "^4.1.5"
"@types/fs-extra" "^8.1.0"
"@types/fs-extra" "^9.0.1"
app-builder-bin "3.5.9"
bluebird-lst "^1.0.9"
builder-util-runtime "8.7.0"
chalk "^4.0.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
debug "^4.1.1"
fs-extra "^9.0.0"
fs-extra "^9.0.1"
is-ci "^2.0.0"
js-yaml "^3.13.1"
js-yaml "^3.14.0"
source-map-support "^0.5.19"
stat-mode "^1.0.0"
temp-file "^3.3.7"
@@ -10294,16 +10301,16 @@ disparity@3.0.0:
ansi-styles "^4.1.0"
diff "^4.0.1"
dmg-builder@22.6.1:
version "22.6.1"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.1.tgz#5777a9eb6904db5bf1f4c69addbf462f5f9bf4e4"
integrity sha512-jUTN0acP15puzevtQASj7QEPgUGpedWSuSnOwR/++JbeYRTwU2oro09h/KZnaeMcxgxjdmT3tYLJeY1XUfPbRg==
dmg-builder@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.8.0.tgz#2b17127837ed444db3086317eda5cf8912f6e6a9"
integrity sha512-orePWjcrl97SYLA8F/6UUtbXJSoZCYu5KOP1lVqD4LOomr8bjGDyEVYZmZYcg5WqKmXucdmO6OpqgzH/aRMMuA==
dependencies:
app-builder-lib "22.6.1"
builder-util "22.6.1"
fs-extra "^9.0.0"
iconv-lite "^0.5.1"
js-yaml "^3.13.1"
app-builder-lib "22.8.0"
builder-util "22.8.0"
fs-extra "^9.0.1"
iconv-lite "^0.6.2"
js-yaml "^3.14.0"
sanitize-filename "^1.6.3"
doctrine@^2.1.0:
@@ -10545,26 +10552,26 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
ejs@^3.1.2:
ejs@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz#514d967a8894084d18d3d47bd169a1c0560f093d"
integrity sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==
dependencies:
jake "^10.6.1"
electron-builder@22.6.1:
version "22.6.1"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.1.tgz#9cc704356ecba1342ff1c94d610aad1f3c6a8b02"
integrity sha512-3/VNg9GfXKHM53TilFtfF1+bsAR8THK1XHgeqCpsiequa02J9jTPc/DhpCUKQPkrs6/EIGxP7uboop7XYoew0Q==
electron-builder@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.8.0.tgz#d2c9fc5438c834e41fd794a271fca200165a3bad"
integrity sha512-dUv4F3srJouqxhWivtKqSoQP4Df6vYgjooGdzms+iYMTFi9f0b4LlEbr7kgsPvte8zAglee7VOGOODkCRJDkUQ==
dependencies:
"@types/yargs" "^15.0.5"
app-builder-lib "22.6.1"
app-builder-lib "22.8.0"
bluebird-lst "^1.0.9"
builder-util "22.6.1"
builder-util-runtime "8.7.0"
chalk "^4.0.0"
dmg-builder "22.6.1"
fs-extra "^9.0.0"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
dmg-builder "22.8.0"
fs-extra "^9.0.1"
is-ci "^2.0.0"
lazy-val "^1.0.4"
read-config-file "6.0.0"
@@ -10595,7 +10602,15 @@ electron-is-dev@^1.0.1:
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e"
integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==
electron-notarize@0.2.1, electron-notarize@^0.2.0:
electron-notarize@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"
electron-notarize@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz#759e8006decae19134f82996ed910db26d9192cc"
integrity sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==
@@ -10638,19 +10653,19 @@ electron-packager@14.1.1:
semver "^6.0.0"
yargs-parser "^16.0.0"
electron-publish@22.6.1:
version "22.6.1"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.1.tgz#d5381220d3e0f3bfa869c5a059fd253a561e0f8a"
integrity sha512-/MkS47ospdSfAFW5Jp52OzYou14HhGJpZ51uAc3GJ5rCfACeqpimC/n1ajRLE3hcXxTWfd3t9MCuClq5jrUO5w==
electron-publish@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.8.0.tgz#7f410fe043abc5d3d896c4ee9eea7a43ea352c7d"
integrity sha512-uM0Zdi9hUqqGOrPj478v7toTvV1Kgto1w11rIiI168batiXAJvNLD8VZRfehOrZT0ibUyZlw8FtxoGCrjyHUOw==
dependencies:
"@types/fs-extra" "^8.1.0"
"@types/fs-extra" "^9.0.1"
bluebird-lst "^1.0.9"
builder-util "22.6.1"
builder-util-runtime "8.7.0"
chalk "^4.0.0"
fs-extra "^9.0.0"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
fs-extra "^9.0.1"
lazy-val "^1.0.4"
mime "^2.4.5"
mime "^2.4.6"
electron-to-chromium@^1.3.488:
version "1.3.496"
@@ -12535,7 +12550,7 @@ fs-extra@^7.0.0, fs-extra@^7.0.1:
jsonfile "^4.0.0"
universalify "^0.1.0"
fs-extra@^9.0.0, fs-extra@^9.0.1:
fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
@@ -13797,7 +13812,7 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
hosted-git-info@^3.0.4:
hosted-git-info@^3.0.5:
version "3.0.5"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03"
integrity sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==
@@ -14081,13 +14096,6 @@ iconv-lite@0.5.0:
dependencies:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.5.1:
version "0.5.2"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8"
integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==
dependencies:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
@@ -15707,7 +15715,7 @@ js-yaml@3.13.1:
argparse "^1.0.7"
esprima "^4.0.0"
js-yaml@3.14.0, js-yaml@3.x, js-yaml@^3.13.1, js-yaml@^3.7.0:
js-yaml@3.14.0, js-yaml@3.x, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.7.0:
version "3.14.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -17389,7 +17397,7 @@ mime@2.4.4:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
mime@^2.0.3, mime@^2.4.5:
mime@^2.0.3, mime@^2.4.6:
version "2.4.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==