Skip to content

Commit

Permalink
Prerelease --> master for Winter '20 (#100)
Browse files Browse the repository at this point in the history
* 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] <support@github.com>

* Update input stub to support "autocomplete" property (#92)

* Update to include date-style and time-style attributes (#94)

* 0.6.1
  • Loading branch information
Trevor committed Oct 16, 2019
1 parent a631c14 commit 84b2b7a
Show file tree
Hide file tree
Showing 5 changed files with 419 additions and 551 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8
- image: circleci/node:lts

steps:
- checkout
Expand Down
19 changes: 10 additions & 9 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@salesforce/sfdx-lwc-jest",
"version": "0.5.5",
"version": "0.6.1",
"description": "Run Jest against LWC components in a Salesforce DX workspace environment",
"main": "src/index.js",
"license": "MIT",
Expand All @@ -20,14 +20,15 @@
"test": "jest"
},
"dependencies": {
"@lwc/compiler": "0.37.4-220.2",
"@lwc/engine": "0.37.4-220.2",
"@lwc/jest-preset": "0.37.4-220.2",
"@lwc/jest-resolver": "0.37.4-220.2",
"@lwc/jest-serializer": "0.37.4-220.2",
"@lwc/jest-transformer": "0.37.4-220.2",
"@lwc/module-resolver": "0.37.4-220.2",
"@lwc/wire-service": "0.37.4-220.2",
"@lwc/compiler": "1.0.2-222.23",
"@lwc/engine": "1.0.2-222.23",
"@lwc/jest-preset": "2.2.0",
"@lwc/jest-resolver": "2.2.0",
"@lwc/jest-serializer": "2.2.0",
"@lwc/jest-transformer": "2.2.0",
"@lwc/module-resolver": "1.0.2-222.23",
"@lwc/synthetic-shadow": "1.0.2-222.23",
"@lwc/wire-service": "1.0.2-222.23",
"@salesforce/wire-service-jest-util": "^2.2.5",
"chalk": "^2.3.0",
"glob": "^7.1.2",
Expand Down
10 changes: 6 additions & 4 deletions scripts/upgrade-lwc.sh
Expand Up @@ -6,12 +6,14 @@
# For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT

LWC_VERSION=$1
LWC_TEST_VERSION=$2

yarn upgrade @lwc/compiler@$LWC_VERSION
yarn upgrade @lwc/engine@$LWC_VERSION
yarn upgrade @lwc/jest-resolver@$LWC_VERSION
yarn upgrade @lwc/jest-serializer@$LWC_VERSION
yarn upgrade @lwc/jest-transformer@$LWC_VERSION
yarn upgrade @lwc/module-resolver@$LWC_VERSION
yarn upgrade @lwc/wire-service@$LWC_VERSION
yarn upgrade @lwc/jest-preset@$LWC_VERSION

yarn upgrade @lwc/jest-resolver@$LWC_TEST_VERSION
yarn upgrade @lwc/jest-serializer@$LWC_TEST_VERSION
yarn upgrade @lwc/jest-transformer@$LWC_TEST_VERSION
yarn upgrade @lwc/jest-preset@$LWC_TEST_VERSION
4 changes: 3 additions & 1 deletion src/config.js
Expand Up @@ -7,6 +7,7 @@
'use strict';

const path = require('path');
const jestPreset = require('@lwc/jest-preset');
const {
PROJECT_ROOT,
getModulePaths,
Expand All @@ -23,6 +24,7 @@ function getCoveragePaths() {
const jestConfig = {
rootDir: PROJECT_ROOT,
moduleFileExtensions: ['js', 'html'],
testEnvironment: jestPreset.testEnvironment || 'jsdom',
transform: {
'^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer')
},
Expand All @@ -38,7 +40,7 @@ const jestConfig = {
],
};

const expectedApiVersion = '46.0';
const expectedApiVersion = '47.0';

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

0 comments on commit 84b2b7a

Please sign in to comment.