Skip to content

Commit 4a2ae39

Browse files
author
Luiz
committed
Change project type to module and adapt test environment accordingly
1 parent 5e61720 commit 4a2ae39

File tree

11 files changed

+1578
-1165
lines changed

11 files changed

+1578
-1165
lines changed

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 363 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
yarnPath: ".yarn/releases/yarn-berry.cjs"
21
nodeLinker: node-modules
2+
3+
plugins:
4+
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
5+
spec: "@yarnpkg/plugin-interactive-tools"
6+
7+
yarnPath: .yarn/releases/yarn-berry.cjs

babel.config.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"lit-element",
1616
"lit"
1717
],
18+
"type": "module",
1819
"main": "wc-context.js",
1920
"files": [
2021
"context-provider.js",
@@ -30,21 +31,14 @@
3031
"<rootDir>/dist/",
3132
"<rootDir>/examples/"
3233
],
33-
"transformIgnorePatterns": [
34-
"/node_modules/(?!(lit|@lit|lit-html|lit-element)/)"
35-
],
36-
"setupFilesAfterEnv": [
37-
"<rootDir>/test/setup.js"
38-
],
3934
"testEnvironment": "jsdom"
4035
},
4136
"devDependencies": {
42-
"@babel/core": "^7.16.5",
43-
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
4437
"@web/dev-server": "^0.1.28",
4538
"eslint": "^8.5.0",
4639
"eslint-config-prettier": "^8.3.0",
47-
"jest": "^27.4.5",
40+
"jest": "^29.3.1",
41+
"jest-environment-jsdom": "^29.3.1",
4842
"lit": "^2.0.2",
4943
"lit-element": "^2",
5044
"prettier": "^2.5.1"
@@ -63,8 +57,6 @@
6357
"lint": "eslint lit-element.js lit.js wc-context.js core.js test",
6458
"start": "web-dev-server --open examples/ --node-resolve",
6559
"start:watch": "web-dev-server --open examples/ --node-resolve --watch",
66-
"test": "jest",
67-
"test:watch": "jest --watch",
68-
"test:cover": "jest --coverage"
60+
"test": "yarn node --experimental-vm-modules $(yarn bin jest)"
6961
}
7062
}

test/consumer.spec.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { jest } from '@jest/globals'
12
import { registerContext, updateContext } from 'wc-context/core.js'
23
import { ContextConsumer } from 'wc-context/controllers.js'
34
import { LitElement } from 'lit'
@@ -7,10 +8,8 @@ const ComponentWithConsumer = class extends LitElement {}
78
customElements.define('lit-controller-consumer', ComponentWithConsumer)
89

910
describe('ContextConsumer', () => {
10-
let rootEl
1111
let grandfatherEl
1212
let parentEl
13-
let childEl
1413

1514
beforeEach(() => {
1615
document.body.innerHTML = `
@@ -25,10 +24,8 @@ describe('ContextConsumer', () => {
2524
</div>
2625
</div>
2726
`
28-
rootEl = document.getElementById('root')
2927
grandfatherEl = document.getElementById('grandfather')
3028
parentEl = document.getElementById('parent')
31-
childEl = document.getElementById('child')
3229
})
3330

3431
it('should consume parent context when connected', () => {
@@ -52,7 +49,7 @@ describe('ContextConsumer', () => {
5249
registerContext(grandfatherEl, 'key', 'value')
5350
const component = new ComponentWithConsumer()
5451
const callback = jest.fn()
55-
const ctxConsumer = new ContextConsumer(component, 'key', callback)
52+
new ContextConsumer(component, 'key', callback)
5653
parentEl.appendChild(component)
5754
expect(callback).toHaveBeenCalledTimes(1)
5855
expect(callback).toHaveBeenCalledWith('value')
@@ -66,7 +63,7 @@ describe('ContextConsumer', () => {
6663
it('should call host requestUpdate when context changes and callback is ommited', async () => {
6764
registerContext(grandfatherEl, 'key', 'value')
6865
const component = new ComponentWithConsumer()
69-
const ctxConsumer = new ContextConsumer(component, 'key')
66+
new ContextConsumer(component, 'key')
7067
parentEl.appendChild(component)
7168
await component.updateComplete
7269
const updateFn = jest.spyOn(component, 'requestUpdate')

test/context-consumer.spec.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
/* eslint-env jest */
2+
import { jest } from '@jest/globals'
23
import { registerContext, updateContext } from '../core'
34

45
import '../context-consumer.js'
56

67
describe('context-consumer', () => {
7-
let rootEl
88
let grandfatherEl
99
let grandfather2El
1010
let parentEl
1111
let childEl
12-
let child3El
1312

1413
beforeEach(() => {
1514
document.body.innerHTML = `
@@ -29,12 +28,10 @@ describe('context-consumer', () => {
2928
</context-consumer>
3029
</div>
3130
`
32-
rootEl = document.getElementById('root')
3331
grandfatherEl = document.getElementById('grandfather')
3432
grandfather2El = document.getElementById('grandfather2')
3533
parentEl = document.getElementById('parent')
3634
childEl = document.getElementById('child')
37-
child3El = document.getElementById('child3')
3835
})
3936

4037
describe('when is a child of a context provider', () => {

test/context-provider.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-env jest */
2+
import { jest } from '@jest/globals'
23
import {
34
registerContext,
45
observeContext,

test/core.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-env jest */
2+
import { jest } from '@jest/globals'
23
import {
34
registerContext,
45
observeContext,

test/provider.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { jest } from '@jest/globals'
12
import { observeContext } from 'wc-context/core.js'
23
import { ContextProvider } from 'wc-context/controllers.js'
34
import { LitElement } from 'lit'

test/setup.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)