Skip to content

Update Webpack in SignalR #47403

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

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Update Webpack in SignalR #47403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions src/SignalR/clients/ts/FunctionalTests/func.jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@ module.exports = {
// We reference the ESM output from tests and don't want to run them through jest as it won't understand the syntax
".*/node_modules/(?!@microsoft)"
],
globals: {
"ts-jest": {
"tsconfig": "./tsconfig.jest.json",
"babelConfig": true,

// Needed in order to properly process the JS files
// We run 'tsc --noEmit' to get TS diagnostics before the test instead
"diagnostics": false,
}
},
reporters: [
"default",
["../common/node_modules/jest-junit/index.js", { "outputDirectory": "../../../../../artifacts/log/", "outputName": `${process.platform}` + ".node.functional.junit.xml" }]
],
transform: {
"^.+\\.(jsx?|tsx?)$": "../common/node_modules/ts-jest"
"^.+\\.(jsx?|tsx?)$": [
"../common/node_modules/ts-jest",
{
"tsconfig": "./tsconfig.jest.json",
"babelConfig": true,

// Needed in order to properly process the JS files
// We run 'tsc --noEmit' to get TS diagnostics before the test instead
"diagnostics": false,
}
]
},
testEnvironment: "node",
testRegex: "(Tests)\\.(jsx?|tsx?)$",
testRunner: "../common/node_modules/jest-jasmine2",
moduleNameMapper: {
"^ts-jest$": "<rootDir>/../common/node_modules/ts-jest",
"^@microsoft/signalr$": "<rootDir>/../signalr/dist/cjs/index.js"
Expand Down
4 changes: 2 additions & 2 deletions src/SignalR/clients/ts/FunctionalTests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"process": "^0.11.10",
"rxjs": "^6.3.3",
"ts-node": "^8.6.2",
"typescript": "^3.7.5",
"webpack": "^5.72.1",
"typescript": "^5.0.2",
"webpack": "^5.76.3",
"ws": " ^6.0.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ setTimeout(() => {
process.exit(1);
}, 1000 * 60 * 20);

function waitForMatches(command: string, process: ChildProcess, regex: RegExp, matchCount: number): Promise<RegExpMatchArray> {
function waitForMatches(command: string, process: ChildProcess, regex: RegExp, matchCount: number): Promise<string[]> {
return new Promise<string[]>((resolve, reject) => {
const commandDebug = _debug(`${command}`);
try {
Expand Down
16 changes: 8 additions & 8 deletions src/SignalR/clients/ts/FunctionalTests/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3589,10 +3589,10 @@ type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"

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

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

webpack@^5.72.1:
version "5.75.0"
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
integrity sha1-HkQEaGR7JQWGDpTJ/z5E1bWCwVI=
webpack@^5.76.3:
version "5.76.3"
resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489"
integrity sha1-3/3HLIlQ5bAy/drZxEUud4fS9Ik=
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^0.0.51"
Expand Down
14 changes: 7 additions & 7 deletions src/SignalR/clients/ts/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
"devDependencies": {
"@types/jest": "^26.0.20",
"@types/node": "^14.14.31",
"@types/webpack": "^5.28.0",
"@typescript-eslint/eslint-plugin": "^5.26.0",
"@typescript-eslint/parser": "^5.26.0",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"eslint": "^8.16.0",
"eslint-plugin-jsdoc": "^39.3.2",
"inspectpack": "^4.6.1",
"jest": "^26.6.3",
"jest": "^29.5.0",
"jest-junit": "^13.0.0",
"jest-jasmine2": "^29.5.0",
"rimraf": "^3.0.2",
"terser": "^5.14.2",
"terser-webpack-plugin": "^5.3.1",
"ts-jest": "^26.5.2",
"ts-jest": "^29.0.5",
"ts-loader": "^8.0.17",
"typescript": "^4.2.2",
"webpack": "^5.72.1",
"typescript": "^4.9.5",
"webpack": "^5.76.3",
"webpack-cli": "^4.9.2"
},
"dependencies": {},
Expand Down
Loading