Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Yarn 2.4.0 #12453

Merged
merged 5 commits into from Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yarn/plugins/@yarnpkg/plugin-babel-release-tool.cjs

Large diffs are not rendered by default.

55 changes: 0 additions & 55 deletions .yarn/releases/yarn-2.3.1.cjs

This file was deleted.

55 changes: 55 additions & 0 deletions .yarn/releases/yarn-2.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
@@ -1,3 +1,3 @@
# Use Yarn 2
# This path should always match the one in .yarnrc.yml
yarn-path ".yarn/releases/yarn-2.3.1.cjs"
yarn-path ".yarn/releases/yarn-2.4.0.cjs"
2 changes: 1 addition & 1 deletion .yarnrc.yml
Expand Up @@ -20,4 +20,4 @@ releaseTool:
unsafeHttpWhitelist:
- localhost

yarnPath: .yarn/releases/yarn-2.3.1.cjs
yarnPath: .yarn/releases/yarn-2.4.0.cjs
7 changes: 4 additions & 3 deletions Makefile
Expand Up @@ -238,9 +238,9 @@ publish:

check-yarn-bug-1882:
ifneq ("$(shell grep 3155328e5 .yarn/releases/yarn-*.cjs -c)", "0")
echo "Your version of yarn is affected by https://github.com/yarnpkg/berry/issues/1882"
echo "Please run `sed -i -e "s/3155328e5/4567890e5/g" .yarn/releases/yarn-*.cjs`"
exit 1
@echo "Your version of yarn is affected by https://github.com/yarnpkg/berry/issues/1882"
@echo "Please run \`sed -i -e "s/3155328e5/4567890e5/g" .yarn/releases/yarn-*.cjs\`"
@exit 1
endif

publish-ci: prepublish
Expand All @@ -259,6 +259,7 @@ ifneq ("$(I_AM_USING_VERDACCIO)", "I_AM_SURE")
echo "You probably don't know what you are doing"
exit 1
endif
$(MAKE) check-yarn-bug-1882
$(YARN) release-tool version $(VERSION) --all --yes --tag-version-prefix="version-e2e-test-"
$(MAKE) prepublish-build
YARN_NPM_PUBLISH_REGISTRY=http://localhost:4873 $(YARN) release-tool publish --yes --tag-version-prefix="version-e2e-test-"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -7399,7 +7399,7 @@ fsevents@^1.2.7:

"fsevents@patch:fsevents@^1.2.7#builtin<compat/fsevents>":
version: 1.2.13
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#builtin<compat/fsevents>::version=1.2.13&hash=127e8e"
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#builtin<compat/fsevents>::version=1.2.13&hash=11e9ea"
dependencies:
bindings: ^1.5.0
nan: ^2.12.1
Expand All @@ -7409,7 +7409,7 @@ fsevents@^1.2.7:

"fsevents@patch:fsevents@^2.1.2#builtin<compat/fsevents>, fsevents@patch:fsevents@~2.1.2#builtin<compat/fsevents>":
version: 2.1.3
resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin<compat/fsevents>::version=2.1.3&hash=127e8e"
resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin<compat/fsevents>::version=2.1.3&hash=11e9ea"
dependencies:
node-gyp: latest
checksum: e2b8c379340e21a786d32c653854c8876f94eb1202dd5be378fd42c062bc123aab5051c32bf0011865257c85982c41ded203f9fe8c9f9c8f8c84dc4672abc0e0
Expand Down Expand Up @@ -13011,11 +13011,11 @@ typescript@^4.0.5:

"typescript@patch:typescript@^4.0.5#builtin<compat/typescript>":
version: 4.0.5
resolution: "typescript@patch:typescript@npm%3A4.0.5#builtin<compat/typescript>::version=4.0.5&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A4.0.5#builtin<compat/typescript>::version=4.0.5&hash=cc6730"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: d4be0bd2a2050b2d7b132cb2a40329178f181543e9d2ac6d1f06babd9f047208558a736a7effdeb28759ae2e815f070b61d10ee2f02cc93a6221a1490f21ffce
checksum: ada6fea7657a51d1b842682d31233e53a3cf509b0edbd6288fda3cfd01643d0190b7ea77837527c4d282c90e61690e19dbfd91be6913e7e7292aa0b588d3506c
languageName: node
linkType: hard

Expand Down