From b8535ac7305fffe9388a86345c5bba1770b241ba Mon Sep 17 00:00:00 2001
From: Will Harney <wharney@salesforce.com>
Date: Wed, 22 May 2024 14:40:03 -0400
Subject: [PATCH 1/2] feat(config): add support for typescript files

---
 src/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.js b/src/config.js
index b815e20..2efdcaf 100644
--- a/src/config.js
+++ b/src/config.js
@@ -29,7 +29,7 @@ function getCoveragePaths() {
 
 const jestConfig = {
     rootDir: PROJECT_ROOT,
-    moduleFileExtensions: ['js', 'html'],
+    moduleFileExtensions: jestPreset.moduleFileExtensions,
     testEnvironment: jestPreset.testEnvironment || 'jsdom',
     transform: {
         '^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer'),

From d5880063a09b8be5fe421fcc8856fedf12b92d71 Mon Sep 17 00:00:00 2001
From: Will Harney <wharney@salesforce.com>
Date: Wed, 22 May 2024 16:18:27 -0400
Subject: [PATCH 2/2] feat(config): use more jest-preset

---
 src/config.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/config.js b/src/config.js
index 2efdcaf..4664545 100644
--- a/src/config.js
+++ b/src/config.js
@@ -28,20 +28,25 @@ function getCoveragePaths() {
 }
 
 const jestConfig = {
-    rootDir: PROJECT_ROOT,
-    moduleFileExtensions: jestPreset.moduleFileExtensions,
+    // Inherited from @lwc/jest-preset
+    moduleFileExtensions: jestPreset.moduleFileExtensions || ['ts', 'js', 'html'],
     testEnvironment: jestPreset.testEnvironment || 'jsdom',
     transform: {
-        '^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer'),
+        ...jestPreset.transform,
+        '^.+\\.(js|ts|html|css)$': require.resolve('@lwc/jest-transformer'),
     },
+    setupFilesAfterEnv: jestPreset.setupFilesAfterEnv || [],
+    snapshotSerializers: jestPreset.snapshotSerializers || [
+        require.resolve('@lwc/jest-serializer'),
+    ],
+    // Specific to sfdx-lwc-jest
+    collectCoverageFrom: getCoveragePaths(),
+    resolver: path.join(__dirname, './resolver.js'),
+    rootDir: PROJECT_ROOT,
+    testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/test/specs/'],
     transformIgnorePatterns: [
         '/node_modules/(?!(.*@salesforce/sfdx-lwc-jest/src/lightning-stubs)/)',
     ],
-    setupFilesAfterEnv: jestPreset.setupFilesAfterEnv || [],
-    resolver: path.resolve(__dirname, './resolver.js'),
-    testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/test/specs/'],
-    collectCoverageFrom: getCoveragePaths(),
-    snapshotSerializers: [require.resolve('@lwc/jest-serializer')],
 };
 
 const expectedApiVersion = '61.0';