Skip to content

Commit b5bef10

Browse files
WesCossickWesCossick
authored
Merge pull request #134 from sparksuite/upgrade-root-packages
Upgrade root packages
2 parents 0c56daa + c20b1a0 commit b5bef10

File tree

8 files changed

+1736
-2421
lines changed

8 files changed

+1736
-2421
lines changed

‎.github/workflows/main.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
name: Lint code
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Use Node.js
23-
uses: actions/setup-node@v1
23+
uses: actions/setup-node@v3
2424
with:
25-
node-version: 14.x
25+
node-version: lts/*
2626
- name: Get yarn cache directory path
2727
id: yarn-cache-dir-path
2828
run: echo "::set-output name=dir::$(yarn cache dir)"
29-
- uses: actions/cache@v2
29+
- uses: actions/cache@v3
3030
id: yarn-cache
3131
with:
3232
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -40,17 +40,17 @@ jobs:
4040
runs-on: ubuntu-latest
4141
strategy:
4242
matrix:
43-
node-version: [14.x, 15.x]
43+
node-version: [lts/*, current]
4444
steps:
45-
- uses: actions/checkout@v2
45+
- uses: actions/checkout@v3
4646
- name: Use Node.js ${{ matrix.node-version }}
47-
uses: actions/setup-node@v1
47+
uses: actions/setup-node@v3
4848
with:
4949
node-version: ${{ matrix.node-version }}
5050
- name: Get yarn cache directory path
5151
id: yarn-cache-dir-path
5252
run: echo "::set-output name=dir::$(yarn cache dir)"
53-
- uses: actions/cache@v2
53+
- uses: actions/cache@v3
5454
id: yarn-cache
5555
with:
5656
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -60,20 +60,20 @@ jobs:
6060
- run: yarn install --frozen-lockfile --prefer-offline
6161
- run: yarn test
6262
- name: Codecov
63-
uses: codecov/codecov-action@v1
63+
uses: codecov/codecov-action@v3
6464
verify-website:
6565
name: Verify website
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v3
6969
- name: Use Node.js
70-
uses: actions/setup-node@v1
70+
uses: actions/setup-node@v3
7171
with:
72-
node-version: 14.x
72+
node-version: lts/*
7373
- name: Get yarn cache directory path
7474
id: yarn-cache-dir-path
7575
run: echo "::set-output name=dir::$(yarn cache dir)"
76-
- uses: actions/cache@v2
76+
- uses: actions/cache@v3
7777
id: yarn-cache
7878
with:
7979
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -94,16 +94,16 @@ jobs:
9494
- verify-website
9595
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
9696
steps:
97-
- uses: actions/checkout@v2
97+
- uses: actions/checkout@v3
9898
- name: Use Node.js
99-
uses: actions/setup-node@v1
99+
uses: actions/setup-node@v3
100100
with:
101-
node-version: 14.x
101+
node-version: lts/*
102102
registry-url: 'https://registry.npmjs.org'
103103
- name: Get yarn cache directory path
104104
id: yarn-cache-dir-path
105105
run: echo "::set-output name=dir::$(yarn cache dir)"
106-
- uses: actions/cache@v2
106+
- uses: actions/cache@v3
107107
id: yarn-cache
108108
with:
109109
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -124,16 +124,16 @@ jobs:
124124
- verify-website
125125
if: github.ref == 'refs/heads/master'
126126
steps:
127-
- uses: actions/checkout@v2
127+
- uses: actions/checkout@v3
128128
- name: Use Node.js
129-
uses: actions/setup-node@v1
129+
uses: actions/setup-node@v3
130130
with:
131-
node-version: 14.x
131+
node-version: lts/*
132132
registry-url: 'https://registry.npmjs.org'
133133
- name: Get yarn cache directory path
134134
id: yarn-cache-dir-path
135135
run: echo "::set-output name=dir::$(yarn cache dir)"
136-
- uses: actions/cache@v2
136+
- uses: actions/cache@v3
137137
id: yarn-cache
138138
with:
139139
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

‎package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,19 @@
3636
"devDependencies": {
3737
"@types/jest": "^26.0.20",
3838
"@types/node": "^14.14.25",
39-
"@typescript-eslint/eslint-plugin": "^4.14.2",
40-
"@typescript-eslint/parser": "^4.14.2",
41-
"eslint": "^7.19.0",
42-
"eslint-config-prettier": "^8.0.0",
43-
"eslint-plugin-react": "^7.22.0",
44-
"jest": "^26.6.3",
39+
"@typescript-eslint/eslint-plugin": "^5.31.0",
40+
"@typescript-eslint/parser": "^5.31.0",
41+
"eslint": "^8.20.0",
42+
"eslint-config-prettier": "^8.5.0",
43+
"eslint-plugin-react": "^7.30.1",
44+
"jest": "^28.1.3",
45+
"jest-environment-jsdom": "^28.1.3",
4546
"jest-ts-webcompat-resolver": "^1.0.0",
46-
"prettier": "^2.2.1",
47+
"prettier": "^2.7.1",
4748
"rugged": "^1.0.0",
48-
"ts-jest": "^26.5.2",
49-
"ts-node": "^9.1.1",
50-
"typescript": "^4.1.3",
49+
"ts-jest": "^28.0.7",
50+
"ts-node": "^10.9.1",
51+
"typescript": "^4.7.4",
5152
"whatwg-fetch": "^3.6.2"
5253
}
5354
}

‎src/retrieve-validation/browser.test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import BadStatusError from './bad-status-error';
99

1010
// Tests
1111
describe('#retrieveFromBrowser()', () => {
12-
afterEach(
13-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
14-
);
12+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
1513

1614
it('Retrieves the results from the W3C Validator API', async () => {
1715
expect(

‎src/retrieve-validation/node.test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import retrieveFromNode from './node';
44

55
// Tests
66
describe('#retrieveFromNode()', () => {
7-
afterEach(
8-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
9-
);
7+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
108

119
it('Retrieves the results from the W3C Validator API', async () => {
1210
expect(

‎src/validate-text.test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ type ValidateText = typeof validateText;
77
// Export this function so we can use it elsewhere
88
export default function testValidateText(validateText: ValidateText): void {
99
describe('#validateText()', () => {
10-
afterEach(
11-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
12-
);
10+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
1311

1412
it('Returns the validity and errors when no options are provided', async () => {
1513
expect(await validateText('.foo { text-align: center; }')).toStrictEqual({

‎src/validate-url.test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ type ValidateURL = typeof validateURL;
77
// Export this function so we can use it elsewhere
88
export default function testValidateURL(validateURL: ValidateURL): void {
99
describe('#validateURL()', () => {
10-
afterEach(
11-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
12-
);
10+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
1311

1412
it('Returns the validity and errors when no options are provided', async () => {
1513
expect(

‎test-projects/browser/index.test.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ describe('#validateText()', () => {
2727
});
2828

2929
// Wait after each test, see "Note" section under https://jigsaw.w3.org/css-validator/manual.html#expert
30-
afterEach(
31-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
32-
);
30+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
3331

3432
// Tests
3533
it('Loads', async () => {
@@ -91,9 +89,7 @@ describe('#validateURL()', () => {
9189
});
9290

9391
// Wait after each test, see "Note" section under https://jigsaw.w3.org/css-validator/manual.html#expert
94-
afterEach(
95-
() => new Promise<void>((resolve) => setTimeout(resolve, 1000))
96-
);
92+
afterEach(() => new Promise<void>((resolve) => setTimeout(resolve, 1000)));
9793

9894
// Tests
9995
it('Loads', async () => {

0 commit comments

Comments
 (0)