Skip to content

Commit 0018cf3

Browse files
ShMcKShMcK
authored
Merge pull request coderoad#541 from coderoad/update-deps
Update deps
2 parents 04977b1 + ccd40ed commit 0018cf3

File tree

7 files changed

+1195
-2017
lines changed

7 files changed

+1195
-2017
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"codeally",
1818
"coderoad",
1919
"flowtype",
20+
"packagejson",
2021
"prismjs",
22+
"Traceback",
2123
"xstate"
2224
]
2325
}

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"scripts": {
2727
"build": "./scripts/build.sh",
2828
"postinstall": "node ./node_modules/vscode/bin/install",
29-
"install-all": "yarn && yarn --cwd web-app",
29+
"install-all": "yarn --ignore-engines && yarn --cwd web-app",
3030
"lint": "eslint web-app/src/**/*.ts src/**/*.ts",
3131
"package": "./scripts/package.sh",
3232
"storybook": "yarn --cwd web-app storybook",
@@ -38,31 +38,31 @@
3838
"dotenv": "^8.2.0",
3939
"eslint": "7.26.0",
4040
"git-url-parse": "11.6.0",
41-
"jest": "26.6.3",
42-
"jsdom": "16.5.3",
43-
"node-fetch": "2.6.1",
41+
"jest": "27.3.1",
42+
"jsdom": "18.1.0",
43+
"node-fetch": "2.6.6",
4444
"semver": "7.3.5",
45-
"ts-jest": "26.5.6",
45+
"ts-jest": "27.0.7",
4646
"typescript": "4.4.4",
4747
"vscode-extension-telemetry": "0.1.7"
4848
},
4949
"devDependencies": {
5050
"@types/assert": "^1.5.6",
5151
"@types/events": "3.0.0",
52-
"@types/jest": "26.0.23",
52+
"@types/jest": "27.0.3",
5353
"@types/jsdom": "^16.2.13",
54-
"@types/node": "15.0.2",
55-
"@types/node-fetch": "2.5.10",
54+
"@types/node": "16.11.9",
55+
"@types/node-fetch": "2.5.12",
5656
"@types/semver": "^7.3.9",
57-
"@typescript-eslint/eslint-plugin": "4.23.0",
58-
"@typescript-eslint/parser": "4.23.0",
57+
"@typescript-eslint/eslint-plugin": "5.4.0",
58+
"@typescript-eslint/parser": "5.4.0",
5959
"eslint-config-prettier": "8.3.0",
6060
"eslint-config-react-app": "6.0.0",
6161
"eslint-plugin-flowtype": "5.7.2",
6262
"eslint-plugin-import": "^2.25.3",
6363
"eslint-plugin-jsx-a11y": "^6.5.1",
64-
"eslint-plugin-prettier": "3.4.0",
65-
"eslint-plugin-react": "^7.27.0",
64+
"eslint-plugin-prettier": "4.0.0",
65+
"eslint-plugin-react": "7.27.1",
6666
"eslint-plugin-react-hooks": "^4.3.0",
6767
"prettier": "^2.4.1",
6868
"vscode": "^1.1.37",

‎src/services/testRunner/parser.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ not ok 2 server should log "Hello World"
174174
failed: [
175175
{
176176
message: 'server should log "Hello World"',
177-
details: `AssertionError [ERR_ASSERTION]: \"Hello World was not logged
177+
details: `AssertionError [ERR_ASSERTION]: "Hello World was not logged
178178
at Context.<anonymous> (test/server.test.js:15:12)
179179
at processImmediate (internal/timers.js:439:21)`,
180180
logs: ['log 1', 'log 2'],
@@ -282,7 +282,7 @@ describe('subtasks', () => {
282282
Object.keys(summary).forEach((key) => {
283283
const match = key.match(subtaskRegex)
284284
if (!!match) {
285-
const { stepId, testId } = match.groups || {}
285+
const { testId } = match.groups || {}
286286
const testIndex = Number(testId) - 1
287287
subtaskSummary[testIndex] = summary[key]
288288
}

‎web-app/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@alifd/next": "1.22.25",
2929
"@emotion/babel-preset-css-prop": "10.0.27",
3030
"@emotion/core": "10.0.35",
31-
"@xstate/react": "1.3.3",
31+
"@xstate/react": "^1.6.2",
3232
"babel-jest": "26.6.3",
3333
"emotion-theming": "10.0.27",
3434
"js-yaml": "3.14.1",
@@ -39,9 +39,9 @@
3939
"react": "16.13.1",
4040
"react-addons-css-transition-group": "15.6.2",
4141
"react-dom": "16.13.1",
42-
"reselect": "4.0.0",
42+
"reselect": "^4.1.4",
4343
"use-media": "1.4.0",
44-
"xstate": "4.19.1"
44+
"xstate": "^4.26.0"
4545
},
4646
"devDependencies": {
4747
"@babel/core": "7.14.0",
@@ -70,6 +70,6 @@
7070
"react-app-rewired": "2.1.8",
7171
"react-scripts": "3.4.3",
7272
"sass-loader": "8.0.2",
73-
"typescript": "4.2.4"
73+
"typescript": "4.4.4"
7474
}
7575
}

‎web-app/src/services/hooks/useFetch.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as yaml from 'js-yaml'
33

44
const useFetch = <T>(url: string, options: object = {}): { data: T | null; error: string | null; loading: boolean } => {
55
const [data, setData] = React.useState(null)
6-
const [error, setError] = React.useState(null)
6+
const [error, setError] = React.useState<string | null>(null)
77
const [loading, setLoading] = React.useState(true)
88
React.useEffect(() => {
99
const fetchData = async () => {
@@ -28,11 +28,11 @@ const useFetch = <T>(url: string, options: object = {}): { data: T | null; error
2828
setLoading(false)
2929
setData(data)
3030
} catch (error) {
31-
setError(error)
31+
setError((error as any).message)
3232
}
3333
}
3434
fetchData()
35-
}, [url])
35+
}, [options, url])
3636
return { data, error, loading }
3737
}
3838

‎web-app/yarn.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4291,10 +4291,10 @@
42914291
"@webassemblyjs/wast-parser" "1.9.0"
42924292
"@xtuc/long" "4.2.2"
42934293

4294-
"@xstate/react@1.3.3":
4295-
version "1.3.3"
4296-
resolved "https://registry.yarnpkg.com/@xstate/react/-/react-1.3.3.tgz#5faf7604b8076d06883348f93b241c38ed0e71f6"
4297-
integrity sha512-10QfCZr3dxahYmpykQ5iGtzjtKJ5dkiu1P4JyD0dGnmQLbBD6XDKCnzfOe5MWD8CocErgsaEMmsTMVsnxIAuYQ==
4294+
"@xstate/react@^1.6.2":
4295+
version "1.6.2"
4296+
resolved "https://registry.yarnpkg.com/@xstate/react/-/react-1.6.2.tgz#b6626884da9476ae22880a8c6daeda12be680a05"
4297+
integrity sha512-G8edXa/pHCoGNDTSJxrlPtUHUszHlCMRvMD84igVZuevEP9ij0pud1FQ0WdCdl6yC++77RCDY+D6v5o1wWtXJQ==
42984298
dependencies:
42994299
use-isomorphic-layout-effect "^1.0.0"
43004300
use-subscription "^1.3.0"
@@ -13910,10 +13910,10 @@ requires-port@^1.0.0:
1391013910
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
1391113911
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
1391213912

13913-
reselect@4.0.0:
13914-
version "4.0.0"
13915-
resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
13916-
integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
13913+
reselect@^4.1.4:
13914+
version "4.1.4"
13915+
resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.4.tgz#66df0aff41b6ee0f51e2cc17cfaf2c1995916f32"
13916+
integrity sha512-i1LgXw8DKSU5qz1EV0ZIKz4yIUHJ7L3bODh+Da6HmVSm9vdL/hG7IpbgzQ3k2XSirzf8/eI7OMEs81gb1VV2fQ==
1391713917

1391813918
resize-observer-polyfill@^1.5.1:
1391913919
version "1.5.1"
@@ -15494,10 +15494,10 @@ typedarray@^0.0.6:
1549415494
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1549515495
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1549615496

15497-
typescript@4.2.4:
15498-
version "4.2.4"
15499-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
15500-
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
15497+
typescript@4.4.4:
15498+
version "4.4.4"
15499+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
15500+
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
1550115501

1550215502
uc.micro@^1.0.1, uc.micro@^1.0.5:
1550315503
version "1.0.6"
@@ -16337,10 +16337,10 @@ xregexp@^4.3.0:
1633716337
dependencies:
1633816338
"@babel/runtime-corejs3" "^7.8.3"
1633916339

16340-
xstate@4.19.1:
16341-
version "4.19.1"
16342-
resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.19.1.tgz#6d6b5388b11a0297894be0caaef2299891c6fb6a"
16343-
integrity sha512-tnBh6ue9MiyoMkE2+w1IqfvJm4nBe3S4Ky/RLvlo9vka8FdO4WyyT3M7PA0pQoM/FZ9aJVWFOlsNw0Nc7E+4Bw==
16340+
xstate@^4.26.0:
16341+
version "4.26.0"
16342+
resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.26.0.tgz#aea3c94b6df57729f55d3d2b83ab9d21801ad24e"
16343+
integrity sha512-l0tfRBhVYM17D6IWT4pVOzzN9kY/5lnPWCe4LXjJ3F9HCrJOPBn6tPRAb9mapSRBS8cOeByJFDCRSNopgaoC5w==
1634416344

1634516345
xtend@^4.0.0, xtend@~4.0.1:
1634616346
version "4.0.2"

0 commit comments

Comments
 (0)