fix: Jest config update (#686)

muenzpraeger · Sep 16, 2020 · b33410a · b33410a
1 parent 134a212
commit b33410a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 ### 2020-09-16
 
-**create-lwc-app 2.1.7**
+**create-lwc-app 2.1.9**
 
 -   Code cleanup and dependency updates
 
-**lwc-services 2.1.7**
+**lwc-services 2.1.9**
 
 -   Code cleanup and dependency updates
 

diff --git a/packages/create-lwc-app/package.json b/packages/create-lwc-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-lwc-app",
-    "version": "2.1.7",
+    "version": "2.1.9",
     "author": "René Winkelmeyer @muenzpraeger",
     "bin": {
         "create-lwc-app": "./bin/run"

diff --git a/packages/lwc-services/package.json b/packages/lwc-services/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lwc-services",
-    "version": "2.1.7",
+    "version": "2.1.9",
     "author": "René Winkelmeyer @muenzpraeger",
     "bin": {
         "lwc-services": "./bin/run"

diff --git a/packages/lwc-services/src/config/jestConfig.ts b/packages/lwc-services/src/config/jestConfig.ts
@@ -1,10 +1,7 @@
-// const jestLwcConfig = require('@lwc/jest-preset')
-// import merge = require('deepmerge')
+const jestLwcConfig = require('@lwc/jest-preset')
 import { resolve } from 'path'
 
-const jestDefaultConfig = {
-    preset: '@lwc/jest-preset',
+export const jestConfig = {
+    ...jestLwcConfig,
     resolver: resolve(__dirname, '../utils/resolver.js')
-}
-
-export const jestConfig = jestDefaultConfig
+}