Skip to content

Commit

Permalink
chore: update yarn (#12454)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SimenB
SimenB committed Feb 22, 2022
1 parent 356b3b0 commit eafc350
Show file tree
Hide file tree
Showing 33 changed files with 1,096 additions and 890 deletions.
343 changes: 263 additions & 80 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
View file

Large diffs are not rendered by default.

768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs
View file

This file was deleted.

785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions .yarnrc
View file

This file was deleted.

6 changes: 5 additions & 1 deletion .yarnrc.yml
View file
@@ -1,5 +1,9 @@
enableGlobalCache: true

logFilters:
- code: YN0032
level: discard

nodeLinker: node-modules

packageExtensions:
Expand All @@ -26,4 +30,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.1.1.cjs
yarnPath: .yarn/releases/yarn-3.2.0.cjs
2 changes: 1 addition & 1 deletion benchmarks/test-file-overhead/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6

"root-workspace-0b6124@workspace:.":
version: 0.0.0-use.local
Expand Down
2 changes: 1 addition & 1 deletion e2e/async-regenerator/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/babel-plugin-jest-hoist/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/code-frame@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/browser-resolver/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"browser-resolve@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/chai-assertion-library-errors/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"assertion-error@npm:^1.1.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/console-winston/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@dabh/diagnostics@npm:^2.0.2":
Expand Down
2 changes: 1 addition & 1 deletion e2e/coverage-handlebars/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"handlebars@npm:^4.7.3":
Expand Down
4 changes: 2 additions & 2 deletions e2e/coverage-remapping/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"root-workspace-0b6124@workspace:.":
Expand All @@ -25,7 +25,7 @@ __metadata:

"typescript@patch:typescript@^3.7.4#~builtin<compat/typescript>":
version: 3.9.10
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=493e53"
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand Down
2 changes: 1 addition & 1 deletion e2e/coverage-report/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/coverage-transform-instrumented/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/expect-async-matcher/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/failures/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/global-setup/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/global-teardown/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/pnp/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6

"foo@portal:./lib::locator=root-workspace-0b6124%40workspace%3A.":
version: 0.0.0-use.local
Expand Down
4 changes: 2 additions & 2 deletions e2e/stack-trace-source-maps-with-coverage/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"root-workspace-0b6124@workspace:.":
Expand All @@ -25,7 +25,7 @@ __metadata:

"typescript@patch:typescript@^3.7.4#~builtin<compat/typescript>":
version: 3.9.10
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=493e53"
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand Down
4 changes: 2 additions & 2 deletions e2e/stack-trace-source-maps/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"root-workspace-0b6124@workspace:.":
Expand All @@ -25,7 +25,7 @@ __metadata:

"typescript@patch:typescript@^3.7.4#~builtin<compat/typescript>":
version: 3.9.10
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=493e53"
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/babel-jest-async/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/babel-jest-manual/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/babel-jest/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/helper-plugin-utils@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/multiple-transformers/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/transform-snapshotResolver/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@babel/code-frame@npm:^7.16.7":
Expand Down
2 changes: 1 addition & 1 deletion e2e/transform/transformer-config/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@ampproject/remapping@npm:^2.0.0":
Expand Down
4 changes: 2 additions & 2 deletions e2e/typescript-coverage/yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"root-workspace-0b6124@workspace:.":
Expand All @@ -25,7 +25,7 @@ __metadata:

"typescript@patch:typescript@^3.3.1#~builtin<compat/typescript>":
version: 3.9.10
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=493e53"
resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Expand Up @@ -59,6 +59,7 @@
"jest-snapshot": "workspace:*",
"jest-watch-typeahead": "^1.0.0",
"jquery": "^3.2.1",
"js-yaml": "^4.1.0",
"lerna": "^4.0.0",
"micromatch": "^4.0.4",
"mock-fs": "^5.1.2",
Expand Down Expand Up @@ -157,5 +158,5 @@
"jest-environment-node": "workspace:*",
"react-native": "patch:react-native@0.67.2#./patches/react-native.patch"
},
"packageManager": "yarn@3.1.1"
"packageManager": "yarn@3.2.0"
}
8 changes: 7 additions & 1 deletion scripts/verifyPnP.js
View file
Expand Up @@ -12,6 +12,7 @@ const path = require('path');
const chalk = require('chalk');
const dedent = require('dedent');
const execa = require('execa');
const yaml = require('js-yaml');
const rimraf = require('rimraf');
const tempy = require('tempy');

Expand All @@ -20,12 +21,17 @@ const rootDirectory = path.resolve(__dirname, '..');
const cwd = tempy.directory();

try {
const yarnRcPath = path.resolve(rootDirectory, '.yarnrc.yml');
const yarnConfig = yaml.load(fs.readFileSync(yarnRcPath, 'utf8'), {
filename: yarnRcPath,
});

fs.writeFileSync(
path.join(cwd, '.yarnrc.yml'),
dedent`
enableGlobalCache: true
yarnPath: ${require.resolve('../.yarn/releases/yarn-3.1.1.cjs')}
yarnPath: ${path.resolve(rootDirectory, yarnConfig.yarnPath)}
`,
);
fs.writeFileSync(
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 5
version: 6
cacheKey: 8

"@algolia/autocomplete-core@npm:1.5.2":
Expand Down Expand Up @@ -2684,6 +2684,7 @@ __metadata:
jest-snapshot: "workspace:*"
jest-watch-typeahead: ^1.0.0
jquery: ^3.2.1
js-yaml: ^4.1.0
lerna: ^4.0.0
micromatch: ^4.0.4
mock-fs: ^5.1.2
Expand Down Expand Up @@ -21483,11 +21484,11 @@ __metadata:

"typescript@patch:typescript@*#~builtin<compat/typescript>, typescript@patch:typescript@^4.2.4#~builtin<compat/typescript>, typescript@patch:typescript@~4.5.2#~builtin<compat/typescript>":
version: 4.5.5
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=493e53"
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: c05c318d79c690f101d7ffb34cd6c7d6bbd884d3af9cefe7749ad0cd6be43c7082f098280982ca945dcba23fde34a08fed9602bb26540936baf8c0520727d3ba
checksum: 858c61fa63f7274ca4aaaffeced854d550bf416cff6e558c4884041b3311fb662f476f167cf5c9f8680c607239797e26a2ee0bcc6467fbc05bfcb218e1c6c671
languageName: node
linkType: hard

Expand Down

0 comments on commit eafc350

Please sign in to comment.