Merge remote-tracking branch 'origin/master' into feat-settings-ui
# Conflicts: # web/package.json # web/pnpm-lock.yamlfeat-settings-ui
James Elliott
commit
5e9fe907c8
|
|
@ -77,7 +77,7 @@
|
|||
"@limegrass/eslint-plugin-import-alias": "1.0.6",
|
||||
"@testing-library/jest-dom": "5.16.5",
|
||||
"@testing-library/react": "14.0.0",
|
||||
"@types/node": "18.16.3",
|
||||
"@types/node": "18.16.4",
|
||||
"@types/react": "18.2.5",
|
||||
"@types/react-dom": "18.2.3",
|
||||
"@types/testing-library__jest-dom": "5.14.5",
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
"prettier": "2.8.8",
|
||||
"react-test-renderer": "18.2.0",
|
||||
"typescript": "5.0.4",
|
||||
"vite": "4.3.4",
|
||||
"vite": "4.3.5",
|
||||
"vite-plugin-eslint": "1.8.1",
|
||||
"vite-plugin-istanbul": "4.0.1",
|
||||
"vite-plugin-svgr": "3.2.0",
|
||||
|
|
|
|||
|
|
@ -97,8 +97,8 @@ devDependencies:
|
|||
specifier: 14.0.0
|
||||
version: 14.0.0(react-dom@18.2.0)(react@18.2.0)
|
||||
'@types/node':
|
||||
specifier: 18.16.3
|
||||
version: 18.16.3
|
||||
specifier: 18.16.4
|
||||
version: 18.16.4
|
||||
'@types/react':
|
||||
specifier: 18.2.5
|
||||
version: 18.2.5
|
||||
|
|
@ -119,7 +119,7 @@ devDependencies:
|
|||
version: 5.59.2(eslint@8.39.0)(typescript@5.0.4)
|
||||
'@vitejs/plugin-react':
|
||||
specifier: 4.0.0
|
||||
version: 4.0.0(vite@4.3.4)
|
||||
version: 4.0.0(vite@4.3.5)
|
||||
'@vitest/coverage-istanbul':
|
||||
specifier: 0.31.0
|
||||
version: 0.31.0(vitest@0.31.0)
|
||||
|
|
@ -172,20 +172,20 @@ devDependencies:
|
|||
specifier: 5.0.4
|
||||
version: 5.0.4
|
||||
vite:
|
||||
specifier: 4.3.4
|
||||
version: 4.3.4(@types/node@18.16.3)
|
||||
specifier: 4.3.5
|
||||
version: 4.3.5(@types/node@18.16.4)
|
||||
vite-plugin-eslint:
|
||||
specifier: 1.8.1
|
||||
version: 1.8.1(eslint@8.39.0)(vite@4.3.4)
|
||||
version: 1.8.1(eslint@8.39.0)(vite@4.3.5)
|
||||
vite-plugin-istanbul:
|
||||
specifier: 4.0.1
|
||||
version: 4.0.1(vite@4.3.4)
|
||||
version: 4.0.1(vite@4.3.5)
|
||||
vite-plugin-svgr:
|
||||
specifier: 3.2.0
|
||||
version: 3.2.0(vite@4.3.4)
|
||||
version: 3.2.0(vite@4.3.5)
|
||||
vite-tsconfig-paths:
|
||||
specifier: 4.2.0
|
||||
version: 4.2.0(typescript@5.0.4)(vite@4.3.4)
|
||||
version: 4.2.0(typescript@5.0.4)(vite@4.3.5)
|
||||
vitest:
|
||||
specifier: 0.31.0
|
||||
version: 0.31.0(happy-dom@9.10.9)
|
||||
|
|
@ -1639,15 +1639,15 @@ packages:
|
|||
'@commitlint/execute-rule': 17.4.0
|
||||
'@commitlint/resolve-extends': 17.4.4
|
||||
'@commitlint/types': 17.4.4
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
chalk: 4.1.2
|
||||
cosmiconfig: 8.1.3
|
||||
cosmiconfig-typescript-loader: 4.3.0(@types/node@18.16.3)(cosmiconfig@8.1.3)(ts-node@10.9.1)(typescript@5.0.4)
|
||||
cosmiconfig-typescript-loader: 4.3.0(@types/node@18.16.4)(cosmiconfig@8.1.3)(ts-node@10.9.1)(typescript@5.0.4)
|
||||
lodash.isplainobject: 4.0.6
|
||||
lodash.merge: 4.6.2
|
||||
lodash.uniq: 4.5.0
|
||||
resolve-from: 5.0.0
|
||||
ts-node: 10.9.1(@types/node@18.16.3)(typescript@5.0.4)
|
||||
ts-node: 10.9.1(@types/node@18.16.4)(typescript@5.0.4)
|
||||
typescript: 5.0.4
|
||||
transitivePeerDependencies:
|
||||
- '@swc/core'
|
||||
|
|
@ -2195,7 +2195,7 @@ packages:
|
|||
'@jest/schemas': 29.4.3
|
||||
'@types/istanbul-lib-coverage': 2.0.4
|
||||
'@types/istanbul-reports': 3.0.1
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
'@types/yargs': 17.0.24
|
||||
chalk: 4.1.2
|
||||
dev: true
|
||||
|
|
@ -2741,7 +2741,7 @@ packages:
|
|||
resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
|
||||
dependencies:
|
||||
'@types/connect': 3.4.35
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
dev: true
|
||||
|
||||
/@types/chai-subset@1.3.3:
|
||||
|
|
@ -2757,7 +2757,7 @@ packages:
|
|||
/@types/connect@3.4.35:
|
||||
resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
|
||||
dependencies:
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
dev: true
|
||||
|
||||
/@types/eslint@8.37.0:
|
||||
|
|
@ -2774,7 +2774,7 @@ packages:
|
|||
/@types/express-serve-static-core@4.17.33:
|
||||
resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==}
|
||||
dependencies:
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
'@types/qs': 6.9.7
|
||||
'@types/range-parser': 1.2.4
|
||||
dev: true
|
||||
|
|
@ -2827,8 +2827,8 @@ packages:
|
|||
resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
|
||||
dev: true
|
||||
|
||||
/@types/node@18.16.3:
|
||||
resolution: {integrity: sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==}
|
||||
/@types/node@18.16.4:
|
||||
resolution: {integrity: sha512-LUhvPmAKAbgm+p/K11IWszLZVoZDlMF4NRmqbhEzDz/CnCuehPkZXwZbBCKGJsgjnuVejotBwM7B3Scrq4EqDw==}
|
||||
dev: true
|
||||
|
||||
/@types/normalize-package-data@2.4.1:
|
||||
|
|
@ -2885,7 +2885,7 @@ packages:
|
|||
resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==}
|
||||
dependencies:
|
||||
'@types/mime': 3.0.1
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
dev: true
|
||||
|
||||
/@types/stack-utils@2.0.1:
|
||||
|
|
@ -3117,7 +3117,7 @@ packages:
|
|||
eslint-visitor-keys: 3.4.0
|
||||
dev: true
|
||||
|
||||
/@vitejs/plugin-react@4.0.0(vite@4.3.4):
|
||||
/@vitejs/plugin-react@4.0.0(vite@4.3.5):
|
||||
resolution: {integrity: sha512-HX0XzMjL3hhOYm+0s95pb0Z7F8O81G7joUHgfDd/9J/ZZf5k4xX6QAMFkKsHFxaHlf6X7GD7+XuaZ66ULiJuhQ==}
|
||||
engines: {node: ^14.18.0 || >=16.0.0}
|
||||
peerDependencies:
|
||||
|
|
@ -3127,7 +3127,7 @@ packages:
|
|||
'@babel/plugin-transform-react-jsx-self': 7.21.0(@babel/core@7.21.4)
|
||||
'@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.21.4)
|
||||
react-refresh: 0.14.0
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
dev: true
|
||||
|
|
@ -3744,7 +3744,7 @@ packages:
|
|||
browserslist: 4.21.5
|
||||
dev: true
|
||||
|
||||
/cosmiconfig-typescript-loader@4.3.0(@types/node@18.16.3)(cosmiconfig@8.1.3)(ts-node@10.9.1)(typescript@5.0.4):
|
||||
/cosmiconfig-typescript-loader@4.3.0(@types/node@18.16.4)(cosmiconfig@8.1.3)(ts-node@10.9.1)(typescript@5.0.4):
|
||||
resolution: {integrity: sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==}
|
||||
engines: {node: '>=12', npm: '>=6'}
|
||||
peerDependencies:
|
||||
|
|
@ -3753,9 +3753,9 @@ packages:
|
|||
ts-node: '>=10'
|
||||
typescript: '>=3'
|
||||
dependencies:
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
cosmiconfig: 8.1.3
|
||||
ts-node: 10.9.1(@types/node@18.16.3)(typescript@5.0.4)
|
||||
ts-node: 10.9.1(@types/node@18.16.4)(typescript@5.0.4)
|
||||
typescript: 5.0.4
|
||||
dev: true
|
||||
|
||||
|
|
@ -5639,7 +5639,7 @@ packages:
|
|||
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
|
||||
dependencies:
|
||||
'@jest/types': 29.5.0
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
chalk: 4.1.2
|
||||
ci-info: 3.8.0
|
||||
graceful-fs: 4.2.11
|
||||
|
|
@ -7168,7 +7168,7 @@ packages:
|
|||
engines: {node: '>=8'}
|
||||
dev: true
|
||||
|
||||
/ts-node@10.9.1(@types/node@18.16.3)(typescript@5.0.4):
|
||||
/ts-node@10.9.1(@types/node@18.16.4)(typescript@5.0.4):
|
||||
resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
|
||||
peerDependencies:
|
||||
'@swc/core': '>=1.2.50'
|
||||
|
|
@ -7186,7 +7186,7 @@ packages:
|
|||
'@tsconfig/node12': 1.0.11
|
||||
'@tsconfig/node14': 1.0.3
|
||||
'@tsconfig/node16': 1.0.3
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
acorn: 8.8.2
|
||||
acorn-walk: 8.2.0
|
||||
arg: 4.1.3
|
||||
|
|
@ -7381,7 +7381,7 @@ packages:
|
|||
engines: {node: '>= 0.8'}
|
||||
dev: true
|
||||
|
||||
/vite-node@0.31.0(@types/node@18.16.3):
|
||||
/vite-node@0.31.0(@types/node@18.16.4):
|
||||
resolution: {integrity: sha512-8x1x1LNuPvE2vIvkSB7c1mApX5oqlgsxzHQesYF7l5n1gKrEmrClIiZuOFbFDQcjLsmcWSwwmrWrcGWm9Fxc/g==}
|
||||
engines: {node: '>=v14.18.0'}
|
||||
dependencies:
|
||||
|
|
@ -7390,7 +7390,7 @@ packages:
|
|||
mlly: 1.2.0
|
||||
pathe: 1.1.0
|
||||
picocolors: 1.0.0
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- '@types/node'
|
||||
- less
|
||||
|
|
@ -7401,7 +7401,7 @@ packages:
|
|||
- terser
|
||||
dev: true
|
||||
|
||||
/vite-plugin-eslint@1.8.1(eslint@8.39.0)(vite@4.3.4):
|
||||
/vite-plugin-eslint@1.8.1(eslint@8.39.0)(vite@4.3.5):
|
||||
resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==}
|
||||
peerDependencies:
|
||||
eslint: '>=7'
|
||||
|
|
@ -7411,10 +7411,10 @@ packages:
|
|||
'@types/eslint': 8.37.0
|
||||
eslint: 8.39.0
|
||||
rollup: 2.79.1
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
dev: true
|
||||
|
||||
/vite-plugin-istanbul@4.0.1(vite@4.3.4):
|
||||
/vite-plugin-istanbul@4.0.1(vite@4.3.5):
|
||||
resolution: {integrity: sha512-1fUCJyYvt/vkDQWR/15knwCk+nWmNbVbmZTXf/X4XD0dcdmJsYrZF5JQo7ttYxFyflGH2SVu+XRlpN06CakKPQ==}
|
||||
peerDependencies:
|
||||
vite: '>=2.9.1 <= 5'
|
||||
|
|
@ -7423,12 +7423,12 @@ packages:
|
|||
istanbul-lib-instrument: 5.2.1
|
||||
picocolors: 1.0.0
|
||||
test-exclude: 6.0.0
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
dev: true
|
||||
|
||||
/vite-plugin-svgr@3.2.0(vite@4.3.4):
|
||||
/vite-plugin-svgr@3.2.0(vite@4.3.5):
|
||||
resolution: {integrity: sha512-Uvq6niTvhqJU6ga78qLKBFJSDvxWhOnyfQSoKpDPMAGxJPo5S3+9hyjExE5YDj6Lpa4uaLkGc1cBgxXov+LjSw==}
|
||||
peerDependencies:
|
||||
vite: ^2.6.0 || 3 || 4
|
||||
|
|
@ -7436,13 +7436,13 @@ packages:
|
|||
'@rollup/pluginutils': 5.0.2
|
||||
'@svgr/core': 7.0.0
|
||||
'@svgr/plugin-jsx': 7.0.0
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- rollup
|
||||
- supports-color
|
||||
dev: true
|
||||
|
||||
/vite-tsconfig-paths@4.2.0(typescript@5.0.4)(vite@4.3.4):
|
||||
/vite-tsconfig-paths@4.2.0(typescript@5.0.4)(vite@4.3.5):
|
||||
resolution: {integrity: sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==}
|
||||
peerDependencies:
|
||||
vite: '*'
|
||||
|
|
@ -7453,13 +7453,13 @@ packages:
|
|||
debug: 4.3.4
|
||||
globrex: 0.1.2
|
||||
tsconfck: 2.1.1(typescript@5.0.4)
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
- typescript
|
||||
dev: true
|
||||
|
||||
/vite@3.2.5(@types/node@18.16.3):
|
||||
/vite@3.2.5(@types/node@18.16.4):
|
||||
resolution: {integrity: sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==}
|
||||
engines: {node: ^14.18.0 || >=16.0.0}
|
||||
peerDependencies:
|
||||
|
|
@ -7483,7 +7483,7 @@ packages:
|
|||
terser:
|
||||
optional: true
|
||||
dependencies:
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
esbuild: 0.15.18
|
||||
postcss: 8.4.21
|
||||
resolve: 1.22.2
|
||||
|
|
@ -7492,8 +7492,8 @@ packages:
|
|||
fsevents: 2.3.2
|
||||
dev: true
|
||||
|
||||
/vite@4.3.4(@types/node@18.16.3):
|
||||
resolution: {integrity: sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==}
|
||||
/vite@4.3.5(@types/node@18.16.4):
|
||||
resolution: {integrity: sha512-0gEnL9wiRFxgz40o/i/eTBwm+NEbpUeTWhzKrZDSdKm6nplj+z4lKz8ANDgildxHm47Vg8EUia0aicKbawUVVA==}
|
||||
engines: {node: ^14.18.0 || >=16.0.0}
|
||||
peerDependencies:
|
||||
'@types/node': '>= 14'
|
||||
|
|
@ -7516,7 +7516,7 @@ packages:
|
|||
terser:
|
||||
optional: true
|
||||
dependencies:
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
esbuild: 0.17.18
|
||||
postcss: 8.4.23
|
||||
rollup: 3.21.0
|
||||
|
|
@ -7528,10 +7528,10 @@ packages:
|
|||
resolution: {integrity: sha512-rKh+rzW54HYfgYjCU/9n8t0V8rnxYiH67uJGYUKKqW5L87Cl8NESDzNe2BbD6WmNvM4ojQdc0VqLXv6QsDt1Jw==}
|
||||
dependencies:
|
||||
'@types/express': 4.17.17
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
'@vitest-preview/dev-utils': 0.0.1
|
||||
express: 4.18.2
|
||||
vite: 3.2.5(@types/node@18.16.3)
|
||||
vite: 3.2.5(@types/node@18.16.4)
|
||||
transitivePeerDependencies:
|
||||
- less
|
||||
- sass
|
||||
|
|
@ -7573,7 +7573,7 @@ packages:
|
|||
dependencies:
|
||||
'@types/chai': 4.3.4
|
||||
'@types/chai-subset': 1.3.3
|
||||
'@types/node': 18.16.3
|
||||
'@types/node': 18.16.4
|
||||
'@vitest/expect': 0.31.0
|
||||
'@vitest/runner': 0.31.0
|
||||
'@vitest/snapshot': 0.31.0
|
||||
|
|
@ -7594,8 +7594,8 @@ packages:
|
|||
strip-literal: 1.0.1
|
||||
tinybench: 2.4.0
|
||||
tinypool: 0.5.0
|
||||
vite: 4.3.4(@types/node@18.16.3)
|
||||
vite-node: 0.31.0(@types/node@18.16.3)
|
||||
vite: 4.3.5(@types/node@18.16.4)
|
||||
vite-node: 0.31.0(@types/node@18.16.4)
|
||||
why-is-node-running: 2.2.2
|
||||
transitivePeerDependencies:
|
||||
- less
|
||||
|
|
|
|||
Loading…
Reference in New Issue