Skip to content

Commit 014b815

Browse files
authored
[release/3.1] Redo yarn install (#42173)
* [release/3.1] Redo `yarn install` - get latest versions * [release/3.1] Bump `typescript` dev dependency - avoid problems parsing new `@types/node` files * [release/3.1] Use latest STEW everywhere - avoid package resolution (`MSB3277`) warnings * !fixup! ugh, `yarn.lock` in common
1 parent 1bd072f commit 014b815

File tree

19 files changed

+1966
-1574
lines changed

19 files changed

+1966
-1574
lines changed

src/Components/Ignitor/src/Ignitor.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
2828
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" />
2929
<Reference Include="Microsoft.Extensions.Logging.Console" />
30+
<!-- Pull in requested STEW version consistently. -->
31+
<Reference Include="System.Text.Encodings.Web" />
3032
</ItemGroup>
3133

3234
<ItemGroup>

src/Components/Ignitor/test/Ignitor.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<Reference Include="Ignitor" />
1212
<!-- Avoid MSB3277 warnings due to dependencies brought in through Ignitor targeting netstandard2.0. -->
1313
<Reference Include="System.Text.Json" />
14+
<!-- Pull in requested STEW version consistently. -->
15+
<Reference Include="System.Text.Encodings.Web" />
1416
</ItemGroup>
1517

1618
<ItemGroup>

src/Components/Web.JS/dist/Release/blazor.server.js

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Components/Web.JS/dist/Release/blazor.webassembly.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Components/Web.JS/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@aspnet/signalr": "link:../../SignalR/clients/ts/signalr",
1818
"@aspnet/signalr-protocol-msgpack": "link:../../SignalR/clients/ts/signalr-protocol-msgpack",
1919
"@dotnet/jsinterop": "https://pkgs.dev.azure.com/dnceng/public/_apis/packaging/feeds/40ffd17d-412e-4e95-b1ca-c5e6b3774cd2/npm/packages/@dotnet/jsinterop/versions/3.0.0-preview9.19415.3/content",
20-
"@types/emscripten": "^1.39.3",
20+
"@types/emscripten": "1.39.3",
2121
"@types/jest": "^24.9.1",
2222
"@types/jsdom": "11.0.6",
2323
"@typescript-eslint/eslint-plugin": "^1.13.0",
@@ -27,16 +27,15 @@
2727
"rimraf": "^2.7.1",
2828
"ts-jest": "^24.3.0",
2929
"ts-loader": "^4.4.1",
30-
"typescript": "^3.8.3",
31-
"webpack": "^4.42.1",
32-
"webpack-cli": "^3.3.11"
30+
"typescript": "~3.8.3",
31+
"webpack": "~4.42.1",
32+
"webpack-cli": "3.3.11"
3333
},
3434
"resolutions": {
3535
"**/set-value": "^2.0.1",
3636
"bl": ">=2.2.1",
3737
"lodash": ">=4.17.21",
3838
"tar": ">=4.4.18",
39-
"url-parse": ">=1.5.8",
4039
"minimist": ">=1.2.6",
4140
"ansi-regex": "^4.1.1"
4241
}

src/Components/Web.JS/yarn.lock

Lines changed: 1167 additions & 834 deletions
Large diffs are not rendered by default.

src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<Reference Include="Microsoft.AspNetCore.SignalR" />
1919
<Reference Include="Microsoft.AspNetCore.TestHost" />
2020
<Reference Include="System.Reactive.Linq" />
21+
<!-- Pull in requested STEW version consistently. -->
22+
<Reference Include="System.Text.Encodings.Web" />
2123
</ItemGroup>
2224

2325

src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<ItemGroup>
2121
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
2222
<Reference Include="Microsoft.Extensions.Logging" />
23+
<!-- Pull in requested STEW version consistently. -->
24+
<Reference Include="System.Text.Encodings.Web" />
2325
</ItemGroup>
2426

2527
</Project>

src/SignalR/clients/ts/FunctionalTests/package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"@types/debug": "0.0.30",
1414
"@types/jasmine": "^2.8.8",
1515
"@types/karma": "^1.7.5",
16-
"@types/node": "^9.6.28",
1716
"debug": "^3.1.0",
1817
"es6-promise": "^4.2.4",
1918
"jasmine": "^3.2.0",
@@ -32,8 +31,10 @@
3231
"karma-summary-reporter": "^1.6.0",
3332
"rxjs": "^6.3.3",
3433
"ts-node": "^8.6.2",
35-
"typescript": "^3.7.5",
36-
"ws": " ^6.0.0"
34+
"typescript": "~3.7.5",
35+
"ws": " ^6.0.0",
36+
"//": "Avoid versions that drop support for TypeScript < 3.8",
37+
"@types/node": "<9.6.58"
3738
},
3839
"scripts": {
3940
"preclean": "cd .. && yarn run build",
@@ -53,10 +54,11 @@
5354
},
5455
"resolutions": {
5556
"lodash": ">=4.7.14",
56-
"url-parse": ">=1.5.8",
5757
"minimist": ">=1.2.6",
5858
"async": ">=3.2.2",
59-
"ansi-regex": "^4.1.1"
59+
"ansi-regex": "^4.1.1",
60+
"//": "Avoid versions that drop support for TypeScript < 3.8",
61+
"@types/bluebird": "<3.5.35"
6062
},
6163
"author": "",
6264
"license": "Apache-2.0"

0 commit comments

Comments
 (0)