diff --git a/webapp/package-lock.json b/webapp/package-lock.json index eab2e3c0a4..2c01b78267 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -21972,31 +21972,6 @@ "node": ">= 4" } }, - "node_modules/jest": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", - "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", - "dev": true, - "dependencies": { - "@jest/core": "^27.5.1", - "import-local": "^3.0.2", - "jest-cli": "^27.5.1" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, "node_modules/jest-canvas-mock": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.4.0.tgz", @@ -33264,13 +33239,7 @@ "version": "7.11.0", "license": "MIT", "dependencies": { - "form-data": "4.0.0" - }, - "devDependencies": { - "@babel/preset-typescript": "7.21.0", - "isomorphic-fetch": "3.0.0", - "jest": "*", - "nock": "*" + "form-data": "^4.0.0" }, "peerDependencies": { "@mattermost/types": "*", @@ -33282,23 +33251,6 @@ } } }, - "platform/client/node_modules/@babel/preset-typescript": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz", - "integrity": "sha512-myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.21.0", - "@babel/plugin-transform-typescript": "^7.21.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "platform/components": { "name": "@mattermost/components", "version": "7.11.0", @@ -39301,24 +39253,7 @@ "@mattermost/client": { "version": "file:platform/client", "requires": { - "@babel/preset-typescript": "7.21.0", - "form-data": "4.0.0", - "isomorphic-fetch": "3.0.0", - "jest": "*", - "nock": "*" - }, - "dependencies": { - "@babel/preset-typescript": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz", - "integrity": "sha512-myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.21.0", - "@babel/plugin-transform-typescript": "^7.21.0" - } - } + "form-data": "^4.0.0" } }, "@mattermost/compass-components": { @@ -51785,17 +51720,6 @@ "is-object": "^1.0.1" } }, - "jest": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", - "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", - "dev": true, - "requires": { - "@jest/core": "^27.5.1", - "import-local": "^3.0.2", - "jest-cli": "^27.5.1" - } - }, "jest-canvas-mock": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.4.0.tgz", diff --git a/webapp/platform/client/jest.config.js b/webapp/platform/client/jest.config.js index c00a883a39..d9fa8d2401 100644 --- a/webapp/platform/client/jest.config.js +++ b/webapp/platform/client/jest.config.js @@ -7,5 +7,5 @@ module.exports = { moduleNameMapper: { '^@mattermost/types/(.*)$': '/../types/src/$1', }, - setupFiles: ['isomorphic-fetch'], + setupFiles: ['/src/setupTests.ts'], }; diff --git a/webapp/platform/client/package.json b/webapp/platform/client/package.json index b1ebfac84c..a3f1b0cd2f 100644 --- a/webapp/platform/client/package.json +++ b/webapp/platform/client/package.json @@ -18,13 +18,7 @@ "directory": "webapp/platform/client" }, "dependencies": { - "form-data": "4.0.0" - }, - "devDependencies": { - "@babel/preset-typescript": "7.21.0", - "isomorphic-fetch": "3.0.0", - "jest": "*", - "nock": "*" + "form-data": "^4.0.0" }, "peerDependencies": { "@mattermost/types": "*", diff --git a/webapp/platform/client/src/setupTests.ts b/webapp/platform/client/src/setupTests.ts new file mode 100644 index 0000000000..c4770064f0 --- /dev/null +++ b/webapp/platform/client/src/setupTests.ts @@ -0,0 +1,4 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import 'isomorphic-fetch';