diff --git a/.changeset/fuzzy-plums-beam.md b/.changeset/fuzzy-plums-beam.md new file mode 100644 index 0000000000..07c0d3a3a0 --- /dev/null +++ b/.changeset/fuzzy-plums-beam.md @@ -0,0 +1,9 @@ +--- +'merchant-center-application-template-starter': patch +'merchant-center-application-template-starter-typescript': patch +'@commercetools-backend/express': patch +'@commercetools-frontend/application-shell': patch +'@commercetools-frontend/mc-scripts': patch +--- + +Update `msw` to `v0.44.0` diff --git a/application-templates/starter-typescript/package.json b/application-templates/starter-typescript/package.json index a092adfdde..811f6bfe0c 100644 --- a/application-templates/starter-typescript/package.json +++ b/application-templates/starter-typescript/package.json @@ -66,7 +66,7 @@ "jest": "27.5.1", "jest-runner-eslint": "1.0.1", "jest-watch-typeahead": "1.1.0", - "msw": "0.39.2", + "msw": "0.44.0", "omit-empty-es": "1.1.3", "prettier": "2.6.2", "react": "17.0.2", diff --git a/application-templates/starter/package.json b/application-templates/starter/package.json index 5d20b2994f..5feeced695 100644 --- a/application-templates/starter/package.json +++ b/application-templates/starter/package.json @@ -62,7 +62,7 @@ "jest": "27.5.1", "jest-runner-eslint": "1.0.1", "jest-watch-typeahead": "1.1.0", - "msw": "0.39.2", + "msw": "0.44.0", "omit-empty-es": "1.1.3", "prettier": "2.6.2", "prop-types": "15.8.1", diff --git a/packages-backend/express/package.json b/packages-backend/express/package.json index 5d206e4762..7c131ca328 100644 --- a/packages-backend/express/package.json +++ b/packages-backend/express/package.json @@ -30,6 +30,6 @@ "@types/express-unless": "^0.5.3", "@types/jsonwebtoken": "^8.5.8", "jose": "2.0.5", - "msw": "0.39.2" + "msw": "0.44.0" } } diff --git a/packages/application-shell/package.json b/packages/application-shell/package.json index 0e9f2d6b61..155514e6a4 100644 --- a/packages/application-shell/package.json +++ b/packages/application-shell/package.json @@ -108,7 +108,7 @@ "@apollo/client": "3.6.9", "@testing-library/react": "12.1.5", "@testing-library/react-hooks": "7.0.2", - "msw": "0.39.2", + "msw": "0.44.0", "react": "17.0.2", "react-dom": "17.0.2", "react-intl": "^5.25.1", diff --git a/packages/mc-scripts/package.json b/packages/mc-scripts/package.json index 799b43e49a..15c811aaf5 100644 --- a/packages/mc-scripts/package.json +++ b/packages/mc-scripts/package.json @@ -113,7 +113,7 @@ "@types/node-fetch": "2.6.2", "@types/serve-handler": "^6.1.1", "mock-fs": "^5.1.2", - "msw": "0.39.2", + "msw": "0.44.0", "rimraf": "3.0.2" }, "engines": { diff --git a/playground/src/components/state-machines-list/state-machines-list.spec.js b/playground/src/components/state-machines-list/state-machines-list.spec.js index 3ec303cc94..edf76d5571 100644 --- a/playground/src/components/state-machines-list/state-machines-list.spec.js +++ b/playground/src/components/state-machines-list/state-machines-list.spec.js @@ -5,6 +5,7 @@ import { screen, waitFor, fireEvent, + within, } from '@commercetools-frontend/application-shell/test-utils'; import { GtmContext } from '@commercetools-frontend/application-shell'; import { entryPointUriPath } from '../../constants'; @@ -90,7 +91,9 @@ describe('list view', () => { `/my-project/${entryPointUriPath}/1` ); }); - await screen.findByText(/state-key-1/i); + + const dialog = await screen.findByRole('dialog'); + await within(dialog).findByText(/state-key-1/i); }); }); @@ -102,14 +105,17 @@ describe('details view', () => { route: `/my-project/${entryPointUriPath}/2`, }); - await screen.findByText(/state-key-2/i); + const dialog = await screen.findByRole('dialog'); + await within(dialog).findByText(/state-key-2/i); }); it('should retrigger request if id changes', async () => { mockServer.use(fetchAllStates(), fetchState()); const { history, gtmMock } = renderApp({ route: `/my-project/${entryPointUriPath}/1`, }); - await screen.findByText(/state-key-1/i); + + const dialog = await screen.findByRole('dialog'); + await within(dialog).findByText(/state-key-1/i); await waitFor(() => { expect(gtmMock.track).toHaveBeenCalledWith( 'rendered', @@ -118,7 +124,7 @@ describe('details view', () => { }); history.push(`/my-project/${entryPointUriPath}/2`); - await screen.findByText(/state-key-2/i); + await within(dialog).findByText(/state-key-2/i); }); }); diff --git a/yarn.lock b/yarn.lock index 4c27639db0..46f8d544f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3215,7 +3215,7 @@ __metadata: express-jwt: 7.7.0 jose: 2.0.5 jwks-rsa: 2.1.1 - msw: 0.39.2 + msw: 0.44.0 languageName: unknown linkType: soft @@ -3572,7 +3572,7 @@ __metadata: memoize-one: 5.2.1 moment: ^2.29.4 moment-timezone: ^0.5.34 - msw: 0.39.2 + msw: 0.44.0 omit-empty-es: 1.1.3 perfume.js: 6.4.0 prop-types: 15.8.1 @@ -3910,7 +3910,7 @@ __metadata: mini-css-extract-plugin: 2.6.0 mock-fs: ^5.1.2 moment-locales-webpack-plugin: 1.2.0 - msw: 0.39.2 + msw: 0.44.0 node-fetch: 2.6.7 postcss: 8.4.14 postcss-custom-media: 8.0.0 @@ -8371,27 +8371,29 @@ __metadata: languageName: node linkType: hard -"@mswjs/cookies@npm:^0.2.0": - version: 0.2.0 - resolution: "@mswjs/cookies@npm:0.2.0" +"@mswjs/cookies@npm:^0.2.2": + version: 0.2.2 + resolution: "@mswjs/cookies@npm:0.2.2" dependencies: "@types/set-cookie-parser": ^2.4.0 set-cookie-parser: ^2.4.6 - checksum: 218d169df02cda261e68e0203812a68affa6396d0041b23c70c4865cf757bebc47ffe3f66df39b94f666f004da42cb9b56e61f089b21c59e6cb88abce8537f19 + checksum: 23b1ef56d57efcc1b44600076f531a1fb703855af342a31e01bad4adaf0dab51f6d3b5595a95a7988c3f612ba075835f9a06c52833205284d101eb9a51dd72b0 languageName: node linkType: hard -"@mswjs/interceptors@npm:^0.15.1": - version: 0.15.1 - resolution: "@mswjs/interceptors@npm:0.15.1" +"@mswjs/interceptors@npm:^0.17.2": + version: 0.17.3 + resolution: "@mswjs/interceptors@npm:0.17.3" dependencies: "@open-draft/until": ^1.0.3 + "@types/debug": ^4.1.7 "@xmldom/xmldom": ^0.7.5 debug: ^4.3.3 headers-polyfill: ^3.0.4 outvariant: ^1.2.1 - strict-event-emitter: ^0.2.0 - checksum: 896ebae458f92fd601ed7dd3a5dfd18b30be54e7558a57f689013627ec5d4a50e2794a1c04d5bf587f40a65f9163a930cf88e54b12fa96bfa1677e7c12c7cb59 + strict-event-emitter: ^0.2.4 + web-encoding: ^1.1.5 + checksum: 1c879fe78e2e19e29f610d3572f22990b67f3f892719530ed1d8b0191a644e03461b812ed8137586ab126e66c49dbfd53ea1ff830696589d1b1ad238df40f206 languageName: node linkType: hard @@ -10467,6 +10469,15 @@ __metadata: languageName: node linkType: hard +"@types/debug@npm:^4.1.7": + version: 4.1.7 + resolution: "@types/debug@npm:4.1.7" + dependencies: + "@types/ms": "*" + checksum: 0a7b89d8ed72526858f0b61c6fd81f477853e8c4415bb97f48b1b5545248d2ae389931680b94b393b993a7cfe893537a200647d93defe6d87159b96812305adc + languageName: node + linkType: hard + "@types/dompurify@npm:^2.3.1": version: 2.3.2 resolution: "@types/dompurify@npm:2.3.2" @@ -10852,6 +10863,13 @@ __metadata: languageName: node linkType: hard +"@types/ms@npm:*": + version: 0.7.31 + resolution: "@types/ms@npm:0.7.31" + checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da + languageName: node + linkType: hard + "@types/node-fetch@npm:2": version: 2.5.12 resolution: "@types/node-fetch@npm:2.5.12" @@ -12104,6 +12122,13 @@ __metadata: languageName: node linkType: hard +"@zxing/text-encoding@npm:0.9.0": + version: 0.9.0 + resolution: "@zxing/text-encoding@npm:0.9.0" + checksum: c23b12aee7639382e4949961304a1294776afaffa40f579e09ffecd0e5e68cf26ef3edd75009de46da8a536e571448755ca68b3e2ea707d53793c0edb2e2c34a + languageName: node + linkType: hard + "JSONStream@npm:^1.0.4": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" @@ -27548,7 +27573,7 @@ __metadata: jest: 27.5.1 jest-runner-eslint: 1.0.1 jest-watch-typeahead: 1.1.0 - msw: 0.39.2 + msw: 0.44.0 omit-empty-es: 1.1.3 prettier: 2.6.2 react: 17.0.2 @@ -27608,7 +27633,7 @@ __metadata: jest: 27.5.1 jest-runner-eslint: 1.0.1 jest-watch-typeahead: 1.1.0 - msw: 0.39.2 + msw: 0.44.0 omit-empty-es: 1.1.3 prettier: 2.6.2 prop-types: 15.8.1 @@ -28258,12 +28283,12 @@ __metadata: languageName: node linkType: hard -"msw@npm:0.39.2": - version: 0.39.2 - resolution: "msw@npm:0.39.2" +"msw@npm:0.44.0": + version: 0.44.0 + resolution: "msw@npm:0.44.0" dependencies: - "@mswjs/cookies": ^0.2.0 - "@mswjs/interceptors": ^0.15.1 + "@mswjs/cookies": ^0.2.2 + "@mswjs/interceptors": ^0.17.2 "@open-draft/until": ^1.0.3 "@types/cookie": ^0.4.1 "@types/js-levenshtein": ^1.1.1 @@ -28276,14 +28301,20 @@ __metadata: is-node-process: ^1.0.1 js-levenshtein: ^1.1.6 node-fetch: ^2.6.7 + outvariant: ^1.3.0 path-to-regexp: ^6.2.0 statuses: ^2.0.0 strict-event-emitter: ^0.2.0 type-fest: ^1.2.2 yargs: ^17.3.1 + peerDependencies: + typescript: ">= 4.2.x <= 4.7.x" + peerDependenciesMeta: + typescript: + optional: true bin: msw: cli/index.js - checksum: 4802f5568cbaadedd488f03b953523fb5dd7e1b8e48a85f142d7cfd1b8c25241729a0af4a06b9f2be543c18b67475c8777fa4924bdc6f1de19dbe142ea4a8405 + checksum: fd8baab3be02bb04f254fd7651237fb675197fda05bbfcfb082d457658c8a7de0c6f2ea6158d42ceddc4d66366ef26c8f0621eaa94c53148f65948c3638397fc languageName: node linkType: hard @@ -29271,6 +29302,13 @@ __metadata: languageName: node linkType: hard +"outvariant@npm:^1.3.0": + version: 1.3.0 + resolution: "outvariant@npm:1.3.0" + checksum: ac76ca375c1c642989e1c74f0e9ebac84c05bc9fdc8f28be949c16fae1658e9f1f2fb1133fe3cc1e98afabef78fe4298fe9360b5734baf8e6ad440c182680848 + languageName: node + linkType: hard + "p-cancelable@npm:^1.0.0": version: 1.1.0 resolution: "p-cancelable@npm:1.1.0" @@ -34282,6 +34320,15 @@ __metadata: languageName: node linkType: hard +"strict-event-emitter@npm:^0.2.4": + version: 0.2.4 + resolution: "strict-event-emitter@npm:0.2.4" + dependencies: + events: ^3.3.0 + checksum: fe6af7baf4002910ffd04d16f37c994e7b9f56b4c01c8846a3b394efcea6689a9eba3ebcd5283774476c3a7632aae6b47ef89061b0fbf7f2256b8e07a5cab32d + languageName: node + linkType: hard + "strict-uri-encode@npm:^2.0.0": version: 2.0.0 resolution: "strict-uri-encode@npm:2.0.0" @@ -36838,7 +36885,7 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0": +"util@npm:^0.12.0, util@npm:^0.12.3": version: 0.12.4 resolution: "util@npm:0.12.4" dependencies: @@ -37237,6 +37284,19 @@ __metadata: languageName: node linkType: hard +"web-encoding@npm:^1.1.5": + version: 1.1.5 + resolution: "web-encoding@npm:1.1.5" + dependencies: + "@zxing/text-encoding": 0.9.0 + util: ^0.12.3 + dependenciesMeta: + "@zxing/text-encoding": + optional: true + checksum: 2234a2b122f41006ce07859b3c0bf2e18f46144fda2907d5db0b571b76aa5c26977c646100ad9c00d2f8a4f6f2b848bc02147845d8c447ab365ec4eff376338d + languageName: node + linkType: hard + "web-namespaces@npm:^1.0.0": version: 1.1.4 resolution: "web-namespaces@npm:1.1.4"