From b33410a83ecff189c2e9071c10d95279ea3a4af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Winkelmeyer?= Date: Wed, 16 Sep 2020 14:42:13 +0200 Subject: [PATCH] fix: Jest config update (#686) --- CHANGELOG.md | 4 ++-- packages/create-lwc-app/package.json | 2 +- packages/lwc-services/package.json | 2 +- packages/lwc-services/src/config/jestConfig.ts | 11 ++++------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0b8c7dd..4a328d3d 100644 --- 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 index b546b9ae..79e393f5 100644 --- 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 index 288a8ba0..bba174ed 100644 --- 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 index 33c5c20d..eae30ca2 100644 --- 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 +} \ No newline at end of file