Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump npm dependencies and lock file format #103639

Merged
merged 7 commits into from
Jun 27, 2024
Merged

bump npm dependencies and lock file format #103639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d321f11
- lockfileVersion: 3
pavelsavara Jun 18, 2024
ba5e8fc
remove broken samples
pavelsavara Jun 18, 2024
70c8ff2
more
pavelsavara Jun 19, 2024
c8f990e
npm
pavelsavara Jun 20, 2024
d03e98e
Merge branch 'main' into npm_bump
pavelsavara Jun 20, 2024
3d88d5a
tests failing on nodejs
pavelsavara Jun 20, 2024
6eb4dbd
Merge branch 'main' into npm_bump
pavelsavara Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ await server.AcceptConnectionAsync(async connection =>
});
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNodeJS))]
[MemberData(nameof(Interim1xxStatusCode))]
public async Task SendAsync_Unexpected1xxResponses_DropAllInterimResponses(HttpStatusCode responseStatusCode)
{
Expand Down Expand Up @@ -1910,7 +1910,7 @@ await connection.ReadRequestHeaderAndSendCustomResponseAsync(
});
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNodeJS))]
[InlineData(false, false)]
[InlineData(false, true)]
[InlineData(true, false)]
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<WasmExtraFilesToDeploy Include="package.json" />
<WasmExtraFilesToDeploy Include="package-lock.json" />

<NodeNpmModule Include="ws" Alias="WebSocket" />
<NodeNpmModule Include="ws" />
<NodeNpmModule Include="node-fetch" />
<NodeNpmModule Include="node-abort-controller" />

Expand Down
197 changes: 133 additions & 64 deletions src/libraries/System.Net.Http/tests/FunctionalTests/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/libraries/System.Net.Http/tests/FunctionalTests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"private": true,
"type": "module",
"dependencies": {
"node-abort-controller": "3.0.1",
"node-fetch": "2.6.7",
"ws": "8.4.0"
"node-abort-controller": "3.1.1",
"node-fetch": "3.3.2",
"ws": "8.17.1"
}
}
2 changes: 1 addition & 1 deletion src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<WasmExtraFilesToDeploy Include="package.json" />
<WasmExtraFilesToDeploy Include="package-lock.json" />

<NodeNpmModule Include="ws" Alias="WebSocket" />
<NodeNpmModule Include="ws" />
</ItemGroup>

<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
Expand Down
24 changes: 7 additions & 17 deletions src/libraries/System.Net.WebSockets.Client/tests/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/libraries/System.Net.WebSockets.Client/tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"private": true,
"type": "module",
"dependencies": {
"ws": "8.4.0"
"ws": "8.17.1"
}
}
}
Loading
Loading