Skip to content

Commit 9250371

Browse files
devversionandrewseguin
authored andcommitted
build: update integration bazel setup to work with Yarn PnP
Our new Yarn PnP integration test unveiled some issues with the tar archive creation that break within Yarn berry. The problem is that Yarn expects a non-collapsing first archive member component. e.g. currently it is: `./package.json`, but Yarn normalizes the path and therefore omits files like the `package.json` completely. The archive member (to match with `yarn pack`) should instead use an actual first component, like `package/package.json`.
1 parent 215f911 commit 9250371

File tree

8 files changed

+2063
-1300
lines changed

8 files changed

+2063
-1300
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ http_archive(
3636

3737
http_archive(
3838
name = "rules_pkg",
39-
sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d",
39+
sha256 = "d94fd5b08dbdc227d66421cb9513f6c3b94bb3938fad276445a2d562f7df8f35",
40+
strip_prefix = "rules_pkg-61018b85819d57feb56886316e76e8ed8a4ce378",
4041
urls = [
41-
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
42-
"https://github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
42+
"https://github.com/bazelbuild/rules_pkg/archive/61018b85819d57feb56886316e76e8ed8a4ce378.tar.gz",
4343
],
4444
)
4545

integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.0-rc.11.cjs

Lines changed: 0 additions & 779 deletions
This file was deleted.

integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.0.cjs

Lines changed: 785 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: pnp
22

3-
yarnPath: .yarn/releases/yarn-3.2.0-rc.11.cjs
3+
yarnPath: .yarn/releases/yarn-3.2.0.cjs

integration/yarn-pnp-compat/package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~13.2.0",
14-
"@angular/cdk": "^13.2.1",
15-
"@angular/common": "~13.2.0",
16-
"@angular/compiler": "~13.2.0",
17-
"@angular/core": "~13.2.0",
18-
"@angular/forms": "~13.2.0",
19-
"@angular/material": "^13.2.1",
20-
"@angular/platform-browser": "~13.2.0",
21-
"@angular/platform-browser-dynamic": "~13.2.0",
22-
"@angular/router": "~13.2.0",
13+
"@angular/animations": "~14.0.0-next.6",
14+
"@angular/cdk": "file:../../dist/releases/cdk",
15+
"@angular/common": "~14.0.0-next.6",
16+
"@angular/compiler": "~14.0.0-next.6",
17+
"@angular/core": "~14.0.0-next.6",
18+
"@angular/forms": "~14.0.0-next.6",
19+
"@angular/material": "file:../../dist/releases/material",
20+
"@angular/material-experimental": "~14.0.0-next.6",
21+
"@angular/platform-browser": "~14.0.0-next.6",
22+
"@angular/platform-browser-dynamic": "~14.0.0-next.6",
23+
"@angular/router": "~14.0.0-next.6",
2324
"rxjs": "~7.5.0",
2425
"tslib": "^2.3.0",
2526
"zone.js": "~0.11.4"
2627
},
2728
"devDependencies": {
28-
"@angular-devkit/build-angular": "~13.2.0",
29-
"@angular/cli": "~13.2.0",
30-
"@angular/compiler-cli": "~13.2.0",
29+
"@angular-devkit/build-angular": "~14.0.0-next.5",
30+
"@angular/cli": "~14.0.0-next.5",
31+
"@angular/compiler-cli": "~14.0.0-next.6",
3132
"@types/jasmine": "~3.10.0",
3233
"@types/node": "^12.11.1",
3334
"jasmine-core": "~4.0.0",
@@ -36,7 +37,7 @@
3637
"karma-coverage": "~2.1.0",
3738
"karma-jasmine": "~4.0.0",
3839
"karma-jasmine-html-reporter": "~1.7.0",
39-
"typescript": "~4.5.2"
40+
"typescript": "~4.6.2"
4041
},
41-
"packageManager": "[email protected]-rc.11"
42+
"packageManager": "[email protected]"
4243
}

0 commit comments

Comments
 (0)