Skip to content

Commit 84b2b7a

Browse files
author
Trevor
authored
Prerelease --> master for Winter '20 (#100)
* Winter '20 (API 47.0) prep * 0.6.0 * use node LTS in CI * Prerelease 0.6.1 (#98) * 0.6.1-alpha1 * wip: synthetic shadow dep * wip: add testEnvironment to preset * update yargs for security alert (#90) * update yargs for security alert * fix test * Bump eslint-utils from 1.3.1 to 1.4.2 (#89) Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](mysticatea/eslint-utils@v1.3.1...v1.4.2) Signed-off-by: dependabot[bot] <[email protected]> * Update input stub to support "autocomplete" property (#92) * Update to include date-style and time-style attributes (#94) * 0.6.1
1 parent a631c14 commit 84b2b7a

File tree

5 files changed

+419
-551
lines changed

5 files changed

+419
-551
lines changed

Diff for: .circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/node:8
5+
- image: circleci/node:lts
66

77
steps:
88
- checkout

Diff for: package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@salesforce/sfdx-lwc-jest",
3-
"version": "0.5.5",
3+
"version": "0.6.1",
44
"description": "Run Jest against LWC components in a Salesforce DX workspace environment",
55
"main": "src/index.js",
66
"license": "MIT",
@@ -20,14 +20,15 @@
2020
"test": "jest"
2121
},
2222
"dependencies": {
23-
"@lwc/compiler": "0.37.4-220.2",
24-
"@lwc/engine": "0.37.4-220.2",
25-
"@lwc/jest-preset": "0.37.4-220.2",
26-
"@lwc/jest-resolver": "0.37.4-220.2",
27-
"@lwc/jest-serializer": "0.37.4-220.2",
28-
"@lwc/jest-transformer": "0.37.4-220.2",
29-
"@lwc/module-resolver": "0.37.4-220.2",
30-
"@lwc/wire-service": "0.37.4-220.2",
23+
"@lwc/compiler": "1.0.2-222.23",
24+
"@lwc/engine": "1.0.2-222.23",
25+
"@lwc/jest-preset": "2.2.0",
26+
"@lwc/jest-resolver": "2.2.0",
27+
"@lwc/jest-serializer": "2.2.0",
28+
"@lwc/jest-transformer": "2.2.0",
29+
"@lwc/module-resolver": "1.0.2-222.23",
30+
"@lwc/synthetic-shadow": "1.0.2-222.23",
31+
"@lwc/wire-service": "1.0.2-222.23",
3132
"@salesforce/wire-service-jest-util": "^2.2.5",
3233
"chalk": "^2.3.0",
3334
"glob": "^7.1.2",

Diff for: scripts/upgrade-lwc.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
# For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
77

88
LWC_VERSION=$1
9+
LWC_TEST_VERSION=$2
910

1011
yarn upgrade @lwc/compiler@$LWC_VERSION
1112
yarn upgrade @lwc/engine@$LWC_VERSION
12-
yarn upgrade @lwc/jest-resolver@$LWC_VERSION
13-
yarn upgrade @lwc/jest-serializer@$LWC_VERSION
14-
yarn upgrade @lwc/jest-transformer@$LWC_VERSION
1513
yarn upgrade @lwc/module-resolver@$LWC_VERSION
1614
yarn upgrade @lwc/wire-service@$LWC_VERSION
17-
yarn upgrade @lwc/jest-preset@$LWC_VERSION
15+
16+
yarn upgrade @lwc/jest-resolver@$LWC_TEST_VERSION
17+
yarn upgrade @lwc/jest-serializer@$LWC_TEST_VERSION
18+
yarn upgrade @lwc/jest-transformer@$LWC_TEST_VERSION
19+
yarn upgrade @lwc/jest-preset@$LWC_TEST_VERSION

Diff for: src/config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'use strict';
88

99
const path = require('path');
10+
const jestPreset = require('@lwc/jest-preset');
1011
const {
1112
PROJECT_ROOT,
1213
getModulePaths,
@@ -23,6 +24,7 @@ function getCoveragePaths() {
2324
const jestConfig = {
2425
rootDir: PROJECT_ROOT,
2526
moduleFileExtensions: ['js', 'html'],
27+
testEnvironment: jestPreset.testEnvironment || 'jsdom',
2628
transform: {
2729
'^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer')
2830
},
@@ -38,7 +40,7 @@ const jestConfig = {
3840
],
3941
};
4042

41-
const expectedApiVersion = '46.0';
43+
const expectedApiVersion = '47.0';
4244

4345
// Execute command is different on Windows.
4446
const jestPath = process.platform == 'win32' ? './node_modules/jest/bin/jest.js' : 'node_modules/.bin/jest';

0 commit comments

Comments
 (0)