diff --git a/app/soapbox/components/ui/form-group/__tests__/form-group.test.tsx b/app/soapbox/components/ui/form-group/__tests__/form-group.test.tsx index 676631a3b5..a762000922 100644 --- a/app/soapbox/components/ui/form-group/__tests__/form-group.test.tsx +++ b/app/soapbox/components/ui/form-group/__tests__/form-group.test.tsx @@ -3,8 +3,6 @@ import React from 'react'; import { render, screen } from '../../../../jest/test-helpers'; import FormGroup from '../form-group'; -jest.mock('uuid', () => jest.requireActual('uuid')); - describe('', () => { it('connects the label and input', () => { render( diff --git a/app/soapbox/jest/test-setup.ts b/app/soapbox/jest/test-setup.ts index 02b746f181..dc27e9a89d 100644 --- a/app/soapbox/jest/test-setup.ts +++ b/app/soapbox/jest/test-setup.ts @@ -15,9 +15,6 @@ jest.mock('soapbox/queries/client'); // https://dev.to/andyhaskell/testing-your-indexeddb-code-with-jest-2o17 require('fake-indexeddb/auto'); -// Mock external dependencies -jest.mock('uuid', () => ({ v4: jest.fn(() => '1') })); - // Clear toasts after each test. afterEach(() => { toast.remove(); diff --git a/jest.config.js b/jest.config.js index 804234ebc1..0974fb6217 100644 Binary files a/jest.config.js and b/jest.config.js differ diff --git a/package.json b/package.json index 29d45cc42b..d24aee60ea 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/redux-mock-store": "^1.0.3", "@types/seedrandom": "^3.0.2", "@types/semver": "^7.3.9", - "@types/uuid": "^8.3.4", + "@types/uuid": "^9.0.0", "@types/webpack-assets-manifest": "^5.1.0", "@types/webpack-bundle-analyzer": "^4.6.0", "@types/webpack-deadcode-plugin": "^0.1.2", @@ -198,7 +198,7 @@ "twemoji": "https://github.com/twitter/twemoji#v14.0.2", "typescript": "^4.4.4", "util": "^0.12.4", - "uuid": "^8.3.2", + "uuid": "^9.0.0", "webpack": "^5.72.1", "webpack-assets-manifest": "^5.1.0", "webpack-bundle-analyzer": "^4.5.0", diff --git a/yarn.lock b/yarn.lock index ec56d736b1..d7f29debab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2964,10 +2964,10 @@ resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== -"@types/uuid@^8.3.4": - version "8.3.4" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" - integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== +"@types/uuid@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.0.tgz#53ef263e5239728b56096b0a869595135b7952d2" + integrity sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q== "@types/webpack-assets-manifest@^5.1.0": version "5.1.0" @@ -11374,6 +11374,11 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"