From 85ec44086932186f30d941640804d334f357c717 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Fri, 2 Aug 2024 15:46:03 -0700 Subject: [PATCH] chore: remove cross-fetch dependency --- package.json | 2 - src/main/content.ts | 1 - src/main/electron-types.ts | 1 - tests/main/content-spec.ts | 15 +- tests/main/electron-types-spec.ts | 86 ++++++----- tests/utils.ts | 8 -- yarn.lock | 227 ++---------------------------- 7 files changed, 61 insertions(+), 279 deletions(-) diff --git a/package.json b/package.json index 6f4731cde5..906b04c4a8 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "algoliasearch": "^4.12.0", "classnames": "^2.2.6", "commander": "^7.1.0", - "cross-fetch": "^3.1.0", "electron-default-menu": "^1.0.2", "electron-devtools-installer": "^3.1.1", "electron-squirrel-startup": "^1.0.0", @@ -121,7 +120,6 @@ "eslint-plugin-import": "^2.27.5", "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-react": "^7.32.2", - "fetch-mock-jest": "^1.5.1", "fork-ts-checker-webpack-plugin": "^8.0.0", "husky": "^9.0.11", "jest": "^29.6.2", diff --git a/src/main/content.ts b/src/main/content.ts index 30f8df8b4a..7d0ca84977 100644 --- a/src/main/content.ts +++ b/src/main/content.ts @@ -1,6 +1,5 @@ import * as path from 'node:path'; -import fetch from 'cross-fetch'; import { IpcMainEvent, app } from 'electron'; import * as fs from 'fs-extra'; diff --git a/src/main/electron-types.ts b/src/main/electron-types.ts index f86812caea..51b6553a9f 100644 --- a/src/main/electron-types.ts +++ b/src/main/electron-types.ts @@ -1,7 +1,6 @@ import * as path from 'node:path'; import { ElectronVersions } from '@electron/fiddle-core'; -import fetch from 'cross-fetch'; import { BrowserWindow, IpcMainEvent, app } from 'electron'; import * as fs from 'fs-extra'; import watch from 'node-watch'; diff --git a/tests/main/content-spec.ts b/tests/main/content-spec.ts index 8c8a961bb2..8706f794f2 100644 --- a/tests/main/content-spec.ts +++ b/tests/main/content-spec.ts @@ -1,6 +1,5 @@ import * as path from 'node:path'; -import { Response, fetch } from 'cross-fetch'; import { app } from 'electron'; import * as fs from 'fs-extra'; import { mocked } from 'jest-mock'; @@ -12,7 +11,6 @@ import { EditorValues, MAIN_JS } from '../../src/interfaces'; import { getTemplate, getTestTemplate } from '../../src/main/content'; import { isReleasedMajor } from '../../src/main/versions'; -jest.mock('cross-fetch'); jest.unmock('fs-extra'); jest.mock('../../src/main/constants', () => ({ STATIC_DIR: path.join(__dirname, '../../static'), @@ -21,11 +19,6 @@ jest.mock('../../src/main/versions', () => ({ isReleasedMajor: jest.fn(), })); -let lastResponse = new Response(null, { - status: 503, - statusText: 'Service Unavailable', -}); - // instead of downloading fixtures, // pull the files from tests/fixtures/templates/ const fetchFromFilesystem = async (url: string) => { @@ -47,8 +40,12 @@ const fetchFromFilesystem = async (url: string) => { } catch (err) { console.log(err); } - lastResponse = new Response(arrayBuffer, { status, statusText }); - return lastResponse; + return { + arrayBuffer: jest.fn().mockResolvedValue(arrayBuffer), + ok: true, + status, + statusText, + } as unknown as Response; }; describe('content', () => { diff --git a/tests/main/electron-types-spec.ts b/tests/main/electron-types-spec.ts index 39760469f4..cca287e04a 100644 --- a/tests/main/electron-types-spec.ts +++ b/tests/main/electron-types-spec.ts @@ -1,7 +1,6 @@ import * as path from 'node:path'; import { ElectronVersions, ReleaseInfo } from '@electron/fiddle-core'; -import { fetch } from 'cross-fetch'; import type { BrowserWindow } from 'electron'; import * as fs from 'fs-extra'; import { mocked } from 'jest-mock'; @@ -20,11 +19,8 @@ import { BrowserWindowMock, NodeTypesMock } from '../mocks/mocks'; import { waitFor } from '../utils'; jest.mock('../../src/main/ipc'); -jest.mock('cross-fetch'); jest.unmock('fs-extra'); -const { Response } = jest.requireActual('cross-fetch'); - describe('ElectronTypes', () => { const version = '10.11.12'; const nodeVersion = '16.2.0'; @@ -152,13 +148,13 @@ describe('ElectronTypes', () => { it('fetches types', async () => { const version = { ...remoteVersion, version: '15.0.0-nightly.20210628' }; const types = 'here are the types'; - mocked(fetch).mockImplementation( - () => - new Response(types, { - status: 200, - statusText: 'OK', - }), - ); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue(types), + json: jest.fn().mockImplementation(async () => JSON.parse(types)), + ok: true, + status: 200, + statusText: 'OK', + } as unknown as Response); await expect( electronTypes.getElectronTypes(browserWindow, version), @@ -175,13 +171,13 @@ describe('ElectronTypes', () => { // setup: fetch and cache a .d.ts that we did not have const types = 'here are the types'; - mocked(fetch).mockImplementation( - () => - new Response(types, { - status: 200, - statusText: 'OK', - }), - ); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue(types), + json: jest.fn().mockImplementation(async () => JSON.parse(types)), + ok: true, + status: 200, + statusText: 'OK', + } as unknown as Response); await expect( electronTypes.getElectronTypes(browserWindow, remoteVersion), ).resolves.toEqual(types); @@ -203,12 +199,12 @@ describe('ElectronTypes', () => { }); it('does not crash if fetch() does not find the package', async () => { - mocked(fetch).mockResolvedValue( - new Response('Cannot find package', { - status: 404, - statusText: 'Not Found', - }), - ); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue('Cannot find package'), + ok: false, + status: 404, + statusText: 'Not Found', + } as unknown as Response); await expect( electronTypes.getElectronTypes(browserWindow, remoteVersion), ).resolves.toBe(undefined); @@ -218,13 +214,14 @@ describe('ElectronTypes', () => { describe('getNodeTypes', () => { it('fetches types', async () => { - mocked(fetch).mockImplementation( - () => - new Response(JSON.stringify({ files: nodeTypesData }), { - status: 200, - statusText: 'OK', - }), - ); + const content = JSON.stringify({ files: nodeTypesData }); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue(content), + json: jest.fn().mockImplementation(async () => JSON.parse(content)), + ok: true, + status: 200, + statusText: 'OK', + } as unknown as Response); const version = { ...remoteVersion, version: '15.0.0-nightly.20210628' }; await expect( @@ -249,12 +246,12 @@ describe('ElectronTypes', () => { }); it('does not crash if fetch() does not find the package', async () => { - mocked(fetch).mockResolvedValue( - new Response('Cannot find package', { - status: 404, - statusText: 'Not Found', - }), - ); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue('Cannot find package'), + ok: false, + status: 404, + statusText: 'Not Found', + } as unknown as Response); await expect( electronTypes.getNodeTypes(remoteVersion.version), ).resolves.toBe(undefined); @@ -276,13 +273,14 @@ describe('ElectronTypes', () => { // setup: fetch and cache some types expect(fs.existsSync(cacheFile)).toBe(false); const types = 'here are the types'; - mocked(fetch).mockImplementation( - () => - new Response(JSON.stringify({ files: types }), { - status: 200, - statusText: 'OK', - }), - ); + const content = JSON.stringify({ files: types }); + mocked(fetch).mockResolvedValue({ + text: jest.fn().mockResolvedValue(content), + json: jest.fn().mockImplementation(async () => JSON.parse(content)), + ok: true, + status: 200, + statusText: 'OK', + } as unknown as Response); await electronTypes.getElectronTypes(browserWindow, remoteVersion); }); diff --git a/tests/utils.ts b/tests/utils.ts index 4aa309cc23..45d8975c07 100644 --- a/tests/utils.ts +++ b/tests/utils.ts @@ -1,4 +1,3 @@ -import { mocked } from 'jest-mock'; import { toJS } from 'mobx'; import { FiddleEvent } from '../src/interfaces'; @@ -60,13 +59,6 @@ export function resetRendererArch() { }); } -export function mockFetchOnce(text: string) { - mocked(window.fetch).mockResolvedValueOnce({ - text: jest.fn().mockResolvedValue(text), - json: jest.fn().mockImplementation(async () => JSON.parse(text)), - } as unknown as Response); -} - export class FetchMock { private readonly urls: Map = new Map(); public add(url: string, content: string) { diff --git a/yarn.lock b/yarn.lock index 00aa97d2db..bde5e849bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -161,11 +161,6 @@ dependencies: "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.13.15": - version "7.14.0" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz" - integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== - "@babel/compat-data@^7.17.10": version "7.17.10" resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz" @@ -176,27 +171,6 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== -"@babel/core@^7.0.0": - version "7.14.0" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz" - integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.0" - "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.14.0" - "@babel/helpers" "^7.14.0" - "@babel/parser" "^7.14.0" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - source-map "^0.5.0" - "@babel/core@^7.11.6": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" @@ -239,15 +213,6 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.14.0": - version "7.14.1" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz" - integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== - dependencies: - "@babel/types" "^7.14.1" - jsesc "^2.5.1" - source-map "^0.5.0" - "@babel/generator@^7.17.10", "@babel/generator@^7.7.2": version "7.17.10" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz" @@ -277,16 +242,6 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-compilation-targets@^7.13.16": - version "7.13.16" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz" - integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== - dependencies: - "@babel/compat-data" "^7.13.15" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" - semver "^6.3.0" - "@babel/helper-compilation-targets@^7.17.10": version "7.17.10" resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz" @@ -340,20 +295,6 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.13.12": - version "7.13.12" - resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz" - integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-module-imports@^7.13.12": - version "7.13.12" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz" - integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== - dependencies: - "@babel/types" "^7.13.12" - "@babel/helper-module-imports@^7.16.7": version "7.16.7" resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz" @@ -368,20 +309,6 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-transforms@^7.14.0": - version "7.14.0" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz" - integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== - dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-replace-supers" "^7.13.12" - "@babel/helper-simple-access" "^7.13.12" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.14.0" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" - "@babel/helper-module-transforms@^7.17.7": version "7.17.7" resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz" @@ -410,13 +337,6 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": version "7.13.0" resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz" @@ -432,23 +352,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== -"@babel/helper-replace-supers@^7.13.12": - version "7.13.12" - resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz" - integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.12" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.12" - -"@babel/helper-simple-access@^7.13.12": - version "7.13.12" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz" - integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== - dependencies: - "@babel/types" "^7.13.12" - "@babel/helper-simple-access@^7.17.7": version "7.17.7" resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz" @@ -463,13 +366,6 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz" @@ -516,11 +412,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - "@babel/helper-validator-option@^7.16.7": version "7.16.7" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz" @@ -531,15 +422,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== -"@babel/helpers@^7.14.0": - version "7.14.0" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz" - integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" - "@babel/helpers@^7.17.9": version "7.17.9" resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz" @@ -594,7 +476,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13": version "7.14.1" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz" integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== @@ -726,15 +608,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.12.13", "@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - "@babel/template@^7.16.7": version "7.16.7" resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz" @@ -762,7 +635,16 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.22.5": +"@babel/template@^7.3.3": + version "7.12.13" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.22.5": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== @@ -778,7 +660,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3": +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.14.1" resolved "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz" integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== @@ -4209,11 +4091,6 @@ copy-webpack-plugin@^11.0.0: schema-utils "^4.0.0" serialize-javascript "^6.0.0" -core-js@^3.0.0: - version "3.12.0" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.12.0.tgz" - integrity sha512-SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw== - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" @@ -4250,13 +4127,6 @@ cross-dirname@^0.1.0: resolved "https://registry.yarnpkg.com/cross-dirname/-/cross-dirname-0.1.0.tgz#b899599f30a5389f59e78c150e19f957ad16a37c" integrity sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q== -cross-fetch@^3.1.0: - version "3.1.5" - resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== - dependencies: - node-fetch "2.6.7" - cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz" @@ -5803,29 +5673,6 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4: node-domexception "^1.0.0" web-streams-polyfill "^3.0.3" -fetch-mock-jest@^1.5.1: - version "1.5.1" - resolved "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz" - integrity sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ== - dependencies: - fetch-mock "^9.11.0" - -fetch-mock@^9.11.0: - version "9.11.0" - resolved "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz" - integrity sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q== - dependencies: - "@babel/core" "^7.0.0" - "@babel/runtime" "^7.0.0" - core-js "^3.0.0" - debug "^4.1.1" - glob-to-regexp "^0.4.0" - is-subset "^0.1.1" - lodash.isequal "^4.5.0" - path-to-regexp "^2.2.1" - querystring "^0.2.0" - whatwg-url "^6.5.0" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" @@ -6272,7 +6119,7 @@ glob-parent@^6.0.1, glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob-to-regexp@^0.4.0, glob-to-regexp@^0.4.1: +glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== @@ -8236,11 +8083,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz" @@ -9157,13 +8999,6 @@ node-domexception@^1.0.0: resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.9" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" @@ -9790,11 +9625,6 @@ path-to-regexp@0.1.7: resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -path-to-regexp@^2.2.1: - version "2.4.0" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz" - integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w== - path-type@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz" @@ -10152,11 +9982,6 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" -querystring@^0.2.0: - version "0.2.1" - resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz" - integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== - querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -11168,11 +10993,6 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz" @@ -11808,13 +11628,6 @@ tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - tr46@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" @@ -12336,11 +12149,6 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - webidl-conversions@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" @@ -12477,15 +12285,6 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -whatwg-url@^6.5.0: - version "6.5.0" - resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz" - integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"