From 37e2bb9233635b326a7e6ca09816b73886269dfc Mon Sep 17 00:00:00 2001 From: thepassle Date: Mon, 11 Dec 2023 13:58:18 +0100 Subject: [PATCH 1/2] fix: sw --- package-lock.json | 352 +++++++++++++++++------------------- packages/mocks/package.json | 2 +- packages/mocks/sw.js | 14 +- 3 files changed, 173 insertions(+), 195 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4131ce100..58b28d4cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3795,6 +3795,23 @@ "node": ">=18" } }, + "node_modules/@mswjs/interceptors": { + "version": "0.25.13", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/@mswjs/interceptors/-/interceptors-0.25.13.tgz", + "integrity": "sha1-x/i4RbX9vY8Pcfu94G2KQKnoGzU=", + "license": "MIT", + "dependencies": { + "@open-draft/deferred-promise": "^2.2.0", + "@open-draft/logger": "^0.3.0", + "@open-draft/until": "^2.0.0", + "is-node-process": "^1.2.0", + "outvariant": "^1.2.1", + "strict-event-emitter": "^0.5.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@nicolo-ribaudo/semver-v6": { "version": "6.3.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", @@ -16541,28 +16558,6 @@ "node": ">=0.4.x" } }, - "node_modules/formdata-node": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz", - "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==", - "license": "MIT", - "dependencies": { - "node-domexception": "1.0.0", - "web-streams-polyfill": "4.0.0-beta.3" - }, - "engines": { - "node": ">= 12.20" - } - }, - "node_modules/formdata-node/node_modules/web-streams-polyfill": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz", - "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==", - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, "node_modules/formdata-polyfill": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", @@ -18359,6 +18354,12 @@ "tslib": "^2.0.3" } }, + "node_modules/headers-polyfill": { + "version": "4.0.2", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/headers-polyfill/-/headers-polyfill-4.0.2.tgz", + "integrity": "sha1-kRWnbu486Pv5W248a/gtk2eFtEo=", + "license": "MIT" + }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -23736,6 +23737,142 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "license": "MIT" }, + "node_modules/msw": { + "version": "2.0.10", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/msw/-/msw-2.0.10.tgz", + "integrity": "sha1-5DzVGEZOHkUguEQrxMmDJq6UFlc=", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@bundled-es-modules/cookie": "^2.0.0", + "@bundled-es-modules/js-levenshtein": "^2.0.1", + "@bundled-es-modules/statuses": "^1.0.1", + "@mswjs/cookies": "^1.1.0", + "@mswjs/interceptors": "^0.25.13", + "@open-draft/until": "^2.1.0", + "@types/cookie": "^0.4.1", + "@types/js-levenshtein": "^1.1.1", + "@types/statuses": "^2.0.1", + "chalk": "^4.1.2", + "chokidar": "^3.4.2", + "graphql": "^16.8.1", + "headers-polyfill": "^4.0.1", + "inquirer": "^8.2.0", + "is-node-process": "^1.2.0", + "js-levenshtein": "^1.1.6", + "outvariant": "^1.4.0", + "path-to-regexp": "^6.2.0", + "strict-event-emitter": "^0.5.0", + "type-fest": "^2.19.0", + "yargs": "^17.3.1" + }, + "bin": { + "msw": "cli/index.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mswjs" + }, + "peerDependencies": { + "typescript": ">= 4.7.x <= 5.2.x" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/msw/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/msw/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/msw/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/msw/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "license": "MIT" + }, + "node_modules/msw/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/msw/node_modules/path-to-regexp": { + "version": "6.2.1", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/path-to-regexp/-/path-to-regexp-6.2.1.tgz", + "integrity": "sha1-1Uk01nmOueXvFOeveWLJRZBpGOU=", + "license": "MIT" + }, + "node_modules/msw/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/msw/node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://pkgs.dev.azure.com/IngEurCDaaS01/IngOne/_packaging/central-npm-feed/npm/registry/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha1-iAaAFbszA2pZi5UuVekxGmD9Ops=", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/multimatch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", @@ -35713,6 +35850,8 @@ }, "packages/dev-server-esbuild/node_modules/@esbuild/darwin-arm64": { "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz", + "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==", "cpu": [ "arm64" ], @@ -35727,6 +35866,8 @@ }, "packages/dev-server-esbuild/node_modules/esbuild": { "version": "0.19.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", + "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==", "hasInstallScript": true, "license": "MIT", "bin": { @@ -36226,174 +36367,13 @@ "@web/storybook-prebuilt": "^0.1.37", "@web/storybook-utils": "^1.0.0", "lit": "^2.7.5 || ^3.0.0", - "msw": "^2.0.0" + "msw": "^2.0.10" }, "devDependencies": { "@web/dev-server": "^0.4.0", "@web/dev-server-storybook": "^2.0.0" } }, - "packages/mocks/node_modules/@mswjs/interceptors": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.25.7.tgz", - "integrity": "sha512-U7iFYs/qU/5jfz1VDpoYz3xqX9nzhsBXw7q923dv6GiGTy+m2ZLhD33L80R/shHOW/YWjeH6k16GbIHGw+bAng==", - "license": "MIT", - "dependencies": { - "@open-draft/deferred-promise": "^2.2.0", - "@open-draft/logger": "^0.3.0", - "@open-draft/until": "^2.0.0", - "is-node-process": "^1.2.0", - "outvariant": "^1.2.1", - "strict-event-emitter": "^0.5.1" - }, - "engines": { - "node": ">=18" - } - }, - "packages/mocks/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/mocks/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "packages/mocks/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "packages/mocks/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "packages/mocks/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "packages/mocks/node_modules/headers-polyfill": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.1.tgz", - "integrity": "sha512-CD3yq1U/nwyKZHRFIjESyveXz6Buk0ImoIwlEOEyNVNAqJLjNX3YkJkaH9Mg5rqU5JiVgTBq/6Z0jR1L6KS0Gg==", - "license": "MIT" - }, - "packages/mocks/node_modules/msw": { - "version": "0.0.0-fetch.rc-23", - "resolved": "https://registry.npmjs.org/msw/-/msw-0.0.0-fetch.rc-23.tgz", - "integrity": "sha512-xH2AFRf5RSLxTTnCBK0wrbdj3KRhM9kiKGZbaUqweruJVYYxyI6TLEPWcEAuET/ytG1mcs7y4nkQe2stHLeBaA==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@bundled-es-modules/cookie": "^2.0.0", - "@bundled-es-modules/js-levenshtein": "^2.0.1", - "@bundled-es-modules/statuses": "^1.0.1", - "@mswjs/cookies": "^1.0.0", - "@mswjs/interceptors": "^0.25.1", - "@open-draft/until": "^2.1.0", - "@types/cookie": "^0.4.1", - "@types/js-levenshtein": "^1.1.1", - "@types/statuses": "^2.0.1", - "chalk": "^4.1.2", - "chokidar": "^3.4.2", - "formdata-node": "4.4.1", - "graphql": "^16.8.1", - "headers-polyfill": "^4.0.1", - "inquirer": "^8.2.0", - "is-node-process": "^1.2.0", - "js-levenshtein": "^1.1.6", - "node-fetch": "^2.6.7", - "outvariant": "^1.4.0", - "path-to-regexp": "^6.2.0", - "strict-event-emitter": "^0.5.0", - "type-fest": "^2.19.0", - "yargs": "^17.3.1" - }, - "bin": { - "msw": "cli/index.js" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mswjs" - }, - "peerDependencies": { - "typescript": ">= 4.7.x <= 5.2.x" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "packages/mocks/node_modules/path-to-regexp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==", - "license": "MIT" - }, - "packages/mocks/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "packages/mocks/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/parse5-utils": { "name": "@web/parse5-utils", "version": "2.1.0", @@ -36716,6 +36696,8 @@ }, "packages/rollup-plugin-workbox/node_modules/@esbuild/darwin-arm64": { "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz", + "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==", "cpu": [ "arm64" ], @@ -36730,6 +36712,8 @@ }, "packages/rollup-plugin-workbox/node_modules/esbuild": { "version": "0.19.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", + "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==", "hasInstallScript": true, "license": "MIT", "bin": { diff --git a/packages/mocks/package.json b/packages/mocks/package.json index 3088ad53e..df3ba087a 100644 --- a/packages/mocks/package.json +++ b/packages/mocks/package.json @@ -66,7 +66,7 @@ "@web/storybook-prebuilt": "^0.1.37", "@web/storybook-utils": "^1.0.0", "lit": "^2.7.5 || ^3.0.0", - "msw": "^2.0.0" + "msw": "2.0.10" }, "devDependencies": { "@web/dev-server": "^0.4.0", diff --git a/packages/mocks/sw.js b/packages/mocks/sw.js index a2c03e728..c559a4054 100644 --- a/packages/mocks/sw.js +++ b/packages/mocks/sw.js @@ -1,15 +1,14 @@ /* eslint-disable */ /* tslint:disable */ -// @ts-nocheck /** - * Mock Service Worker (0.0.0-fetch.rc-23). + * Mock Service Worker (2.0.10). * @see https://github.com/mswjs/msw * - Please do NOT modify this file. * - Please do NOT serve this file on production. */ -const INTEGRITY_CHECKSUM = '0877fcdc026242810f5bfde0d7178db4'; +const INTEGRITY_CHECKSUM = 'c5f7f8e188b673ea4e677df7ea3c5a39'; const IS_MOCKED_RESPONSE = Symbol('isMockedResponse'); const activeClientIds = new Set(); @@ -122,11 +121,6 @@ async function handleRequest(event, requestId) { if (client && activeClientIds.has(client.id)) { (async function () { const responseClone = response.clone(); - // When performing original requests, response body will - // always be a ReadableStream, even for 204 responses. - // But when creating a new Response instance on the client, - // the body for a 204 response must be null. - const responseBody = response.status === 204 ? null : responseClone.body; sendToClient( client, @@ -138,11 +132,11 @@ async function handleRequest(event, requestId) { type: responseClone.type, status: responseClone.status, statusText: responseClone.statusText, - body: responseBody, + body: responseClone.body, headers: Object.fromEntries(responseClone.headers.entries()), }, }, - [responseBody], + [responseClone.body], ); })(); } From 01bd7c45bf7ed7f4ba45cebf0c67b742ace1c684 Mon Sep 17 00:00:00 2001 From: Pascal Schilp Date: Mon, 11 Dec 2023 13:59:26 +0100 Subject: [PATCH 2/2] Create witty-nails-sing.md --- .changeset/witty-nails-sing.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/witty-nails-sing.md diff --git a/.changeset/witty-nails-sing.md b/.changeset/witty-nails-sing.md new file mode 100644 index 000000000..ba6e5c367 --- /dev/null +++ b/.changeset/witty-nails-sing.md @@ -0,0 +1,5 @@ +--- +"@web/mocks": patch +--- + +fix: sw integrity checksum