Skip to content

Commit 16717fa

Browse files
alan-agius4kara
alan-agius4
authored and
kara
committed
fix(bazel): exclude all angular schematics folders from metadata build (#31237)
Fixes #31235 PR Close #31237
1 parent 74f4f5d commit 16717fa

4 files changed

Lines changed: 65 additions & 35 deletions

File tree

‎integration/bazel/angular-metadata.tsconfig.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020
],
2121
"exclude": [
2222
"node_modules/@angular/bazel/**",
23-
"node_modules/@angular/core/schematics/**",
24-
"node_modules/@angular/compiler-cli/**",
2523
"node_modules/@angular/**/testing/**",
24+
"node_modules/@angular/**/schematics/**",
25+
"node_modules/@angular/compiler-cli/**",
2626
"node_modules/@angular/common/upgrade*",
27-
"node_modules/@angular/router/upgrade*",
28-
"node_modules/@angular/cdk/schematics*",
29-
"node_modules/@angular/material/schematics*"
27+
"node_modules/@angular/router/upgrade*"
3028
]
3129
}

‎integration/bazel/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
"license": "MIT",
66
"dependencies": {
77
"@angular/animations": "file:../../dist/packages-dist/animations",
8+
"@angular/cdk": "8.0.1",
89
"@angular/common": "file:../../dist/packages-dist/common",
910
"@angular/core": "file:../../dist/packages-dist/core",
11+
"@angular/forms": "file:../../dist/packages-dist/forms",
12+
"@angular/material": "8.0.1",
1013
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
1114
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
1215
"@angular/router": "file:../../dist/packages-dist/router",

‎integration/bazel/yarn.lock‎

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
rxjs "6.4.0"
3131

3232
"@angular/animations@file:../../dist/packages-dist/animations":
33-
version "8.1.0-beta.0"
33+
version "8.0.0-rc.0"
3434
dependencies:
3535
tslib "^1.9.0"
3636

3737
"@angular/bazel@file:../../dist/packages-dist/bazel":
38-
version "0.0.0"
38+
version "8.0.0-rc.0"
3939
dependencies:
4040
"@angular-devkit/architect" "^0.800.0-beta.15"
4141
"@angular-devkit/core" "^8.0.0-beta.15"
@@ -47,13 +47,22 @@
4747
shelljs "0.8.2"
4848
tsickle "^0.35.0"
4949

50+
"@angular/cdk@8.0.1":
51+
version "8.0.1"
52+
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.1.tgz#106872aa7fac0c55144ed5dd60df9af7e24b436a"
53+
integrity sha512-Ul7rVU/rr4qGHs1w24P/6MHEosYp8AHRxBHrp/yJ50eHbHVS31FyfO8gKfNqPc1bnL1YoYYCs0hIBwNDaz8uDg==
54+
dependencies:
55+
tslib "^1.7.1"
56+
optionalDependencies:
57+
parse5 "^5.0.0"
58+
5059
"@angular/common@file:../../dist/packages-dist/common":
51-
version "8.1.0-beta.0"
60+
version "8.0.0-rc.0"
5261
dependencies:
5362
tslib "^1.9.0"
5463

5564
"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
56-
version "0.0.0"
65+
version "8.0.0-rc.0"
5766
dependencies:
5867
canonical-path "1.0.0"
5968
chokidar "^2.1.1"
@@ -68,51 +77,63 @@
6877
yargs "13.1.0"
6978

7079
"@angular/compiler@file:../../dist/packages-dist/compiler":
71-
version "8.1.0-beta.0"
80+
version "8.0.0-rc.0"
7281
dependencies:
7382
tslib "^1.9.0"
7483

7584
"@angular/core@file:../../dist/packages-dist/core":
76-
version "8.1.0-beta.0"
85+
version "8.0.0-rc.0"
86+
dependencies:
87+
tslib "^1.9.0"
88+
89+
"@angular/forms@file:../../dist/packages-dist/forms":
90+
version "8.0.0-rc.0"
7791
dependencies:
7892
tslib "^1.9.0"
7993

94+
"@angular/material@8.0.1":
95+
version "8.0.1"
96+
resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.1.tgz#cbb3f7776d2405a1d75b6e7eb6675fd80a8a5cf5"
97+
integrity sha512-BozIS+9yiqFTfXBoZfhFUibY8meDUcv/e+CxhSHyv3vZw9XVTNTbiaX7tX/FX0Ai+1VKnwRTGrKvPKGFSqynCA==
98+
dependencies:
99+
tslib "^1.7.1"
100+
80101
"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
81-
version "8.1.0-beta.0"
102+
version "8.0.0-rc.0"
82103
dependencies:
83104
tslib "^1.9.0"
84105

85106
"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
86-
version "8.1.0-beta.0"
107+
version "8.0.0-rc.0"
87108
dependencies:
88109
tslib "^1.9.0"
89110

90111
"@angular/router@file:../../dist/packages-dist/router":
91-
version "8.1.0-beta.0"
112+
version "8.0.0-rc.0"
92113
dependencies:
93114
tslib "^1.9.0"
94115

95-
"@bazel/bazel-darwin_x64@0.26.0":
96-
version "0.26.0"
97-
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0.tgz#24660853a01e286359636025618a1fda1aa978e1"
98-
integrity sha512-9qcRlTW9g8TPJ1PWYIkNDUMsEjdhN4sJz5fDjva3GM7mnIST0sgJiRRW5Y9L3Ksv9+jNWmIOlj5wsibAUYyb5w==
116+
"@bazel/bazel-darwin_x64@0.26.1":
117+
version "0.26.1"
118+
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.1.tgz#1b5c69b635e5c2a8c3090fa5f6bcb45735f06045"
119+
integrity sha512-9VjrR+ce+iS9xS1lgeAo1RAPXlxCvez/r3smN1lP4s4YNF0s5LAT0cevIl6Zz2nwyEha/6JvY3v6Euemy36F0w==
99120

100-
"@bazel/bazel-linux_x64@0.26.0":
101-
version "0.26.0"
102-
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.0.tgz#9302b6df4363b5c492f2755174988935b84fb076"
103-
integrity sha512-v9RTFIZb/A8Ej0Q1uCc/uTCRFZIRGqQpBVLO9Vqkbg4kScND9FxAI2RO0bv3Zhz7YTXBvJ8+kSfd/DY+0azwsA==
121+
"@bazel/bazel-linux_x64@0.26.1":
122+
version "0.26.1"
123+
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.1.tgz#04dd194bdcd6b9d45bd865a9a60c280d0d600251"
124+
integrity sha512-oZooDxI1C4p7o18zx2Uns2cK/NN2hgF2YSBKH0aVDPAAxQA85h+g124CWDEbsghOdRMSBM0Hd0SSeIqwZcqLSw==
104125

105-
"@bazel/bazel-win32_x64@0.26.0":
106-
version "0.26.0"
107-
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.0.tgz#ae878cf2aae0ad9799141e554c47417f426c1aa7"
108-
integrity sha512-hmhuWQUzTmVLDusSt701LFzkWoRdEsakDtEGKgIuQuAJ7zqwH8QUn3PpWIg5BA0qF0gxJBKMfTHGvNhMft3pmg==
126+
"@bazel/bazel-win32_x64@0.26.1":
127+
version "0.26.1"
128+
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.1.tgz#9351f07313173b1f98006da8131c94db7aa7c506"
129+
integrity sha512-0FkOo8+bxw13X2m6ALhXX2241gG9ZXgcLu0E/IbCWy/TmOB5bR0Z73CslszWbXIldVYnANuhFmnkxIa745Du5Q==
109130

110131
"@bazel/bazel@file:../../node_modules/@bazel/bazel":
111-
version "0.26.0"
132+
version "0.26.1"
112133
optionalDependencies:
113-
"@bazel/bazel-darwin_x64" "0.26.0"
114-
"@bazel/bazel-linux_x64" "0.26.0"
115-
"@bazel/bazel-win32_x64" "0.26.0"
134+
"@bazel/bazel-darwin_x64" "0.26.1"
135+
"@bazel/bazel-linux_x64" "0.26.1"
136+
"@bazel/bazel-win32_x64" "0.26.1"
116137

117138
"@bazel/karma@0.30.1":
118139
version "0.30.1"
@@ -2354,6 +2375,11 @@ pako@~1.0.2:
23542375
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
23552376
integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
23562377

2378+
parse5@^5.0.0:
2379+
version "5.1.0"
2380+
resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
2381+
integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
2382+
23572383
parseqs@0.0.5:
23582384
version "0.0.5"
23592385
resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -3213,6 +3239,11 @@ tslib@1.9.3, tslib@^1.8.1, tslib@^1.9.0:
32133239
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
32143240
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
32153241

3242+
tslib@^1.7.1:
3243+
version "1.10.0"
3244+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
3245+
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
3246+
32163247
tsutils@2.27.2:
32173248
version "2.27.2"
32183249
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"

‎packages/bazel/src/schematics/ng-add/files/angular-metadata.tsconfig.json.template‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
],
1818
"exclude": [
1919
"node_modules/@angular/bazel/**",
20-
"node_modules/@angular/core/schematics/**",
21-
"node_modules/@angular/compiler-cli/**",
20+
"node_modules/@angular/**/schematics/**",
2221
"node_modules/@angular/**/testing/**",
22+
"node_modules/@angular/compiler-cli/**",
2323
"node_modules/@angular/common/upgrade*",
24-
"node_modules/@angular/router/upgrade*",
25-
"node_modules/@angular/cdk/schematics*",
26-
"node_modules/@angular/material/schematics*"
24+
"node_modules/@angular/router/upgrade*"
2725
]
2826
}

0 commit comments

Comments
 (0)