update configuration and file names

kobotoolbox · Sep 19, 2024 · 1ee442d · 1ee442d
1 parent 7a86de0
commit 1ee442d
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 33 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -43,7 +43,7 @@ const jsRules = {
   'react/no-multi-comp': 0,
   'react/no-unknown-property': 0,
   'react/prop-types': 0,
-  'react/react-in-jsx-scope': 2,
+  // 'react/react-in-jsx-scope': 2,
   'react/self-closing-comp': 2,
   'react/wrap-multilines': 0,
   strict: 1,

diff --git a/jsapp/jest/jest.config.ts b/jsapp/jest/jest.config.ts
@@ -9,9 +9,7 @@ const config: Config = {
     '\\.(css|scss)$': 'identity-obj-proxy',
   },
   setupFilesAfterEnv: ['<rootDir>/setupJestTest.ts'],
-  transform: {
-    '\\.[jt]sx?$': ['babel-jest', {configFile: `${__dirname}/../../.babelrc.json`}],
-  },
+  transform: {'^.+\\.(t|j)sx?$': '@swc/jest'},
 };
 
 export default config;
diff --git a/jsapp/js/components/common/button.test.tsx → jsapp/js/components/common/button.spec.tsx b/jsapp/js/components/common/button.test.tsx → jsapp/js/components/common/button.spec.tsx
@@ -1,6 +1,3 @@
-import React from 'react';
-import '@testing-library/jest-dom';
-
 import Button from './button';
 
 import {render, screen} from '@testing-library/react';

diff --git a/jsapp/js/components/special/koboAccessibleSelect.spec.tsx b/jsapp/js/components/special/koboAccessibleSelect.spec.tsx
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,6 +87,7 @@
     "@storybook/react-webpack5": "^7.0.24",
     "@storybook/testing-library": "^0.2.0",
     "@swc/core": "^1.6.6",
+    "@swc/jest": "^0.2.36",
     "@tanstack/eslint-plugin-query": "^5.50.1",
     "@tanstack/react-query-devtools": "^5.50.1",
     "@testing-library/jest-dom": "^6.5.0",
@@ -112,7 +113,6 @@
     "@types/lodash.values": "^4.3.7",
     "@types/lodash.zip": "^4.2.7",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^22.5.5",
     "@types/react": "^18.3.3",
     "@types/react-document-title": "^2.0.9",
     "@types/react-dom": "^18.3.0",
@@ -123,7 +123,6 @@
     "@types/react-tagsinput": "^3.20.6",
     "@types/react-test-renderer": "^18.3.0",
     "@types/reflux": "^6.4.6",
-    "@types/testing-library__jest-dom": "^6.0.0",
     "@types/zxcvbn": "^4.4.4",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",

diff --git a/tsconfig.json b/tsconfig.json
@@ -26,8 +26,7 @@
     "allowJs": true,
     "outDir": "out",
     "jsx": "react-jsx",
-    "plugins": [{ "name": "typescript-plugin-css-modules"}],
-    "types": ["@testing-library/jest-dom"]
+    "plugins": [{ "name": "typescript-plugin-css-modules"}]
   },
   "include": [
     "jsapp/**/*.ts",