Skip to content

Commit 9c38b37

Browse files
Update Webpack in SignalR (#47403)
1 parent ffa6b7d commit 9c38b37

File tree

7 files changed

+889
-1960
lines changed

7 files changed

+889
-1960
lines changed

src/SignalR/clients/ts/FunctionalTests/func.jest.config.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@ module.exports = {
66
// We reference the ESM output from tests and don't want to run them through jest as it won't understand the syntax
77
".*/node_modules/(?!@microsoft)"
88
],
9-
globals: {
10-
"ts-jest": {
11-
"tsconfig": "./tsconfig.jest.json",
12-
"babelConfig": true,
13-
14-
// Needed in order to properly process the JS files
15-
// We run 'tsc --noEmit' to get TS diagnostics before the test instead
16-
"diagnostics": false,
17-
}
18-
},
199
reporters: [
2010
"default",
2111
["../common/node_modules/jest-junit/index.js", { "outputDirectory": "../../../../../artifacts/log/", "outputName": `${process.platform}` + ".node.functional.junit.xml" }]
2212
],
2313
transform: {
24-
"^.+\\.(jsx?|tsx?)$": "../common/node_modules/ts-jest"
14+
"^.+\\.(jsx?|tsx?)$": [
15+
"../common/node_modules/ts-jest",
16+
{
17+
"tsconfig": "./tsconfig.jest.json",
18+
"babelConfig": true,
19+
20+
// Needed in order to properly process the JS files
21+
// We run 'tsc --noEmit' to get TS diagnostics before the test instead
22+
"diagnostics": false,
23+
}
24+
]
2525
},
2626
testEnvironment: "node",
2727
testRegex: "(Tests)\\.(jsx?|tsx?)$",
28+
testRunner: "../common/node_modules/jest-jasmine2",
2829
moduleNameMapper: {
2930
"^ts-jest$": "<rootDir>/../common/node_modules/ts-jest",
3031
"^@microsoft/signalr$": "<rootDir>/../signalr/dist/cjs/index.js"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"process": "^0.11.10",
3434
"rxjs": "^6.3.3",
3535
"ts-node": "^8.6.2",
36-
"typescript": "^3.7.5",
37-
"webpack": "^5.72.1",
36+
"typescript": "^5.0.2",
37+
"webpack": "^5.76.3",
3838
"ws": " ^6.0.0"
3939
},
4040
"scripts": {

src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ setTimeout(() => {
4141
process.exit(1);
4242
}, 1000 * 60 * 20);
4343

44-
function waitForMatches(command: string, process: ChildProcess, regex: RegExp, matchCount: number): Promise<RegExpMatchArray> {
44+
function waitForMatches(command: string, process: ChildProcess, regex: RegExp, matchCount: number): Promise<string[]> {
4545
return new Promise<string[]>((resolve, reject) => {
4646
const commandDebug = _debug(`${command}`);
4747
try {

src/SignalR/clients/ts/FunctionalTests/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3589,10 +3589,10 @@ type-is@~1.6.18:
35893589
media-typer "0.3.0"
35903590
mime-types "~2.1.24"
35913591

3592-
typescript@^3.7.5:
3593-
version "3.9.10"
3594-
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
3595-
integrity sha1-cPORCselHta+952ngAaQsZv3eLg=
3592+
typescript@^5.0.2:
3593+
version "5.0.2"
3594+
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
3595+
integrity sha1-iR4akMUYnYUGr2S575Kfypm6HuU=
35963596

35973597
ua-parser-js@^0.7.21, ua-parser-js@^0.7.30:
35983598
version "0.7.33"
@@ -3760,10 +3760,10 @@ webpack-sources@^3.2.3:
37603760
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
37613761
integrity sha1-LU2quEUf1LJAzCcFX/agwszqDN4=
37623762

3763-
webpack@^5.72.1:
3764-
version "5.75.0"
3765-
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
3766-
integrity sha1-HkQEaGR7JQWGDpTJ/z5E1bWCwVI=
3763+
webpack@^5.76.3:
3764+
version "5.76.3"
3765+
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489"
3766+
integrity sha1-3/3HLIlQ5bAy/drZxEUud4fS9Ik=
37673767
dependencies:
37683768
"@types/eslint-scope" "^3.7.3"
37693769
"@types/estree" "^0.0.51"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
"devDependencies": {
1414
"@types/jest": "^26.0.20",
1515
"@types/node": "^14.14.31",
16-
"@types/webpack": "^5.28.0",
17-
"@typescript-eslint/eslint-plugin": "^5.26.0",
18-
"@typescript-eslint/parser": "^5.26.0",
16+
"@typescript-eslint/eslint-plugin": "^5.56.0",
17+
"@typescript-eslint/parser": "^5.56.0",
1918
"eslint": "^8.16.0",
2019
"eslint-plugin-jsdoc": "^39.3.2",
2120
"inspectpack": "^4.6.1",
22-
"jest": "^26.6.3",
21+
"jest": "^29.5.0",
2322
"jest-junit": "^13.0.0",
23+
"jest-jasmine2": "^29.5.0",
2424
"rimraf": "^3.0.2",
2525
"terser": "^5.14.2",
2626
"terser-webpack-plugin": "^5.3.1",
27-
"ts-jest": "^26.5.2",
27+
"ts-jest": "^29.0.5",
2828
"ts-loader": "^8.0.17",
29-
"typescript": "^4.2.2",
30-
"webpack": "^5.72.1",
29+
"typescript": "^4.9.5",
30+
"webpack": "^5.76.3",
3131
"webpack-cli": "^4.9.2"
3232
},
3333
"dependencies": {},

0 commit comments

Comments
 (0)