Skip to content

Commit

Permalink
build: update yarn to v4 (#1459)
Browse files Browse the repository at this point in the history
PR Close #1459
  • Loading branch information
angular-robot authored and josephperrott committed Oct 23, 2023
1 parent 69353e4 commit 9ddc899
Show file tree
Hide file tree
Showing 13 changed files with 9,161 additions and 9,142 deletions.
2 changes: 1 addition & 1 deletion .github/ng-renovate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-renovate",
"packageManager": "yarn@3.6.4",
"packageManager": "yarn@4.0.0",
"type": "commonjs",
"dependencies": {
"renovate": "37.31.3"
Expand Down
4,386 changes: 2,193 additions & 2,193 deletions .github/ng-renovate/yarn.lock

Large diffs are not rendered by default.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.4.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
yarnPath: .yarn/releases/yarn-3.6.4.cjs
yarnPath: .yarn/releases/yarn-4.0.0.cjs
nodeLinker: node-modules
4 changes: 2 additions & 2 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ ts_config(

nodejs_binary(
name = "yarn_berry_vendored",
data = [".yarn/releases/yarn-3.6.4.cjs"],
entry_point = ".yarn/releases/yarn-3.6.4.cjs",
data = [".yarn/releases/yarn-4.0.0.cjs"],
entry_point = ".yarn/releases/yarn-4.0.0.cjs",
visibility = ["//bazel/integration/tests:__subpackages__"],
)

Expand Down
10 changes: 5 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")

nodejs_register_toolchains(
name = "nodejs",
node_version = "18.10.0",
node_version = "18.13.0",
)

load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
Expand All @@ -50,7 +50,7 @@ yarn_install(
# Yarn Berry/v2+ expects `--immutable` instead of `--frozen-lockfile`.
args = ["--immutable"],
data = [
"//:.yarn/releases/yarn-3.6.4.cjs",
"//:.yarn/releases/yarn-4.0.0.cjs",
"//:.yarnrc.yml",
],
# Currently disabled due to:
Expand All @@ -61,20 +61,20 @@ yarn_install(
# We prefer to symlink the `node_modules` to only maintain a single install.
# See https://github.com/angular/dev-infra/pull/446#issuecomment-1059820287 for details.
symlink_node_modules = True,
yarn = "//:.yarn/releases/yarn-3.6.4.cjs",
yarn = "//:.yarn/releases/yarn-4.0.0.cjs",
yarn_lock = "//:yarn.lock",
)

yarn_install(
name = "ts_proto_npm",
args = ["--immutable"],
data = [
"//:.yarn/releases/yarn-3.6.4.cjs",
"//:.yarn/releases/yarn-4.0.0.cjs",
"//tools/ts_proto:.yarnrc.yml",
],
exports_directories_only = False,
package_json = "//tools/ts_proto:package.json",
yarn = "//:.yarn/releases/yarn-3.6.4.cjs",
yarn = "//:.yarn/releases/yarn-4.0.0.cjs",
yarn_lock = "//tools/ts_proto:yarn.lock",
)

Expand Down
8 changes: 4 additions & 4 deletions bazel/integration/tests/yarn_berry_vendored/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 6
cacheKey: 8
version: 8
cacheKey: 10c0

"is-number@npm:^7.0.0":
version: 7.0.0
resolution: "is-number@npm:7.0.0"
checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a
checksum: b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
languageName: node
linkType: hard

"yarn_berry_vendored@workspace:.":
version: 0.0.0-use.local
resolution: "yarn_berry_vendored@workspace:."
dependencies:
is-number: ^7.0.0
is-number: "npm:^7.0.0"
languageName: unknown
linkType: soft
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"default": "./*"
}
},
"packageManager": "yarn@3.6.4",
"packageManager": "yarn@4.0.0",
"dependencies": {
"@angular-devkit/build-angular": "17.0.0-next.9",
"@angular/benchpress": "0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/ts_proto/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
yarnPath: ../../.yarn/releases/yarn-3.6.4.cjs
yarnPath: ../../.yarn/releases/yarn-4.0.0.cjs
nodeLinker: node-modules
2 changes: 1 addition & 1 deletion tools/ts_proto/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ts_proto",
"private": true,
"packageManager": "yarn@3.6.4",
"packageManager": "yarn@4.0.0",
"dependencies": {
"protobufjs": "7.2.5",
"protobufjs-cli": "1.1.2"
Expand Down
Loading

0 comments on commit 9ddc899

Please sign in to comment.