Merge branch 'main' into nickclyde/aidbox

CDCgov · Feb 21, 2025 · 6df30cb · 6df30cb
2 parents 0cce53a + c2ae154
commit 6df30cb
Show file tree

Hide file tree

Showing 22 changed files with 1,649 additions and 697 deletions.
diff --git a/query-connector/.eslintrc.json b/query-connector/.eslintrc.json
@@ -1,10 +1,6 @@
 {
   "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "unused-imports",
-    "jsdoc"
-  ],
+  "plugins": ["@typescript-eslint", "unused-imports", "jsdoc"],
   "extends": [
     "plugin:@next/next/recommended",
     "plugin:jsdoc/recommended-typescript-error",
@@ -44,10 +40,7 @@
   },
   "overrides": [
     {
-      "files": [
-        "*.test*",
-        "**/tests/**/*"
-      ],
+      "files": ["*.test*", "**/tests/**/*"],
       "rules": {
         "jsdoc/require-jsdoc": "off"
       }

diff --git a/query-connector/jest.config.js b/query-connector/jest.config.js
@@ -14,7 +14,14 @@ const customJestConfig = {
   setupFilesAfterEnv: ["<rootDir>/jest.setup.ts"],
   testEnvironment: "jest-fixed-jsdom",
   modulePathIgnorePatterns: ["<rootDir>/.next/"],
+  moduleNameMapper: { "^@/(.*)$": "<rootDir>/src/$1" },
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
-module.exports = createJestConfig(customJestConfig);
+/**
+ * Creates and exports Jest configuration.
+ * @returns The Jest configuration object.
+ */
+module.exports = async () => ({
+  ...(await createJestConfig(customJestConfig)()),
+});