Commit23e3e4c

authored

chore(site): upgrade msw to 2.0 (#12597)

1 parent9cfd5ba commit23e3e4cCopy full SHA for 23e3e4c

File tree

+655

-860

lines changed

+655

-860

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ env:`
`5`	`5`	`es6:true`
`6`	`6`	`jest:true`
`7`	`7`	`node:true`
	`8`	`+ignorePatterns:`
	`9`	`+ -"jest.polyfills.js"`
`8`	`10`	`extends:`
`9`	`11`	`-eslint:recommended`
`10`	`12`	`-plugin:@typescript-eslint/recommended`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ module.exports = {`
`6`	`6`	`{`
`7`	`7`	`displayName:"test",`
`8`	`8`	`roots:["<rootDir>"],`
	`9`	`+setupFiles:["./jest.polyfills.js"],`
`9`	`10`	`setupFilesAfterEnv:["./jest.setup.ts"],`
`10`	`11`	`extensionsToTreatAsEsm:[".ts"],`
`11`	`12`	`transform:{`
`@@ -27,8 +28,18 @@ module.exports = {`
`27`	`28`	`],`
`28`	`29`	`},`
`29`	`30`	`testEnvironment:"jsdom",`
	`31`	`+testEnvironmentOptions:{`
	`32`	`+customExportConditions:[""],`
	`33`	`+},`
`30`	`34`	`testRegex:"(/__tests__/.*\|(\\.\|/)(test\|spec))\\.tsx?$",`
`31`		`-testPathIgnorePatterns:["/node_modules/","/e2e/"],`
	`35`	`+testPathIgnorePatterns:[`
	`36`	`+"/node_modules/",`
	`37`	`+"/e2e/",`
	`38`	`+// TODO: This test is timing out after upgrade a few Jest dependencies`
	`39`	`+// and I was not able to figure out why. When running it specifically, I`
	`40`	`+// can see many act warnings that may can help us to find the issue.`
	`41`	`+"/usePaginatedQuery.test.ts",`
	`42`	`+],`
`32`	`43`	`transformIgnorePatterns:[`
`33`	`44`	`"<rootDir>/node_modules/@chartjs-adapter-date-fns",`
`34`	`45`	`],`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+/**`
	`2`	`+ * Necessary for MSW`
	`3`	`+ *`
	`4`	`+ *@note The block below contains polyfills for Node.js globals`
	`5`	`+ * required for Jest to function when running JSDOM tests.`
	`6`	`+ * These HAVE to be require's and HAVE to be in this exact`
	`7`	`+ * order, since "undici" depends on the "TextEncoder" global API.`
	`8`	`+ *`
	`9`	`+ * Consider migrating to a more modern test runner if`
	`10`	`+ * you don't want to deal with this.`
	`11`	`+ */`
	`12`	`+const{ TextDecoder, TextEncoder}=require("node:util");`
	`13`	`+const{ ReadableStream}=require("node:stream/web");`
	`14`	`+`
	`15`	`+Object.defineProperties(globalThis,{`
	`16`	`+TextDecoder:{value:TextDecoder},`
	`17`	`+TextEncoder:{value:TextEncoder},`
	`18`	`+ReadableStream:{value:ReadableStream},`
	`19`	`+});`
	`20`	`+`
	`21`	`+const{ Blob, File}=require("node:buffer");`
	`22`	`+const{ fetch, Headers, FormData, Request, Response}=require("undici");`
	`23`	`+`
	`24`	`+Object.defineProperties(globalThis,{`
	`25`	`+fetch:{value:fetch,writable:true},`
	`26`	`+Blob:{value:Blob},`
	`27`	`+File:{value:File},`
	`28`	`+Headers:{value:Headers},`
	`29`	`+FormData:{value:FormData},`
	`30`	`+Request:{value:Request},`
	`31`	`+Response:{value:Response},`
	`32`	`+});`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,12 @@`
`1`	`1`	`import"@testing-library/jest-dom";`
`2`	`2`	`import"jest-location-mock";`
`3`	`3`	`import{cleanup}from"@testing-library/react";`
`4`		`-import{Blob}from"buffer";`
`5`	`4`	`importcryptofrom"crypto";`
`6`		`-importjestFetchMockfrom"jest-fetch-mock";`
`7`	`5`	`import{useMemo}from"react";`
`8`		`-import{TextEncoder,TextDecoder}from"util";`
`9`	`6`	`importtype{Region}from"api/typesGenerated";`
`10`	`7`	`importtype{ProxyLatencyReport}from"contexts/useProxyLatency";`
`11`	`8`	`import{server}from"testHelpers/server";`
`12`	`9`
`13`		`-jestFetchMock.enableMocks();`
`14`		`-`
`15`	`10`	`// useProxyLatency does some http requests to determine latency.`
`16`	`11`	`// This would fail unit testing, or at least make it very slow with`
`17`	`12`	`// actual network requests. So just globally mock this hook.`
`@@ -42,11 +37,6 @@ jest.mock("contexts/useProxyLatency", () => ({`
`42`	`37`	`},`
`43`	`38`	`}));`
`44`	`39`
`45`		`-global.TextEncoder=TextEncoder;`
`46`		`-// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Polyfill for jsdom`
`47`		`-global.TextDecoder=TextDecoderasany;`
`48`		`-// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Polyfill for jsdom`
`49`		`-global.Blob=Blobasany;`
`50`	`40`	`global.scrollTo=jest.fn();`
`51`	`41`
`52`	`42`	`window.HTMLElement.prototype.scrollIntoView=jest.fn();`

Lines changed: 2 additions & 2 deletions

Comments

(0)