Skip to content

Commit a07742b

Browse files
jurgelenasjurgelenas
committedApr 8, 2021
Maintenance: upgrade dependencies
·
v1.7.7v0.4.9
1 parent 69bc9ea commit a07742b

File tree

7 files changed

+1442
-1448
lines changed

7 files changed

+1442
-1448
lines changed
 

‎.erb/configs/webpack.config.renderer.dev.babel.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import webpack from 'webpack';
44
import chalk from 'chalk';
55
import { merge } from 'webpack-merge';
66
import { spawn, execSync } from 'child_process';
7+
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
78
import baseConfig from './webpack.config.base';
89
import CheckNodeEnv from '../scripts/CheckNodeEnv';
9-
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
1010

1111
// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
1212
// at the dev webpack config is not accidentally run in a production environment
@@ -25,7 +25,10 @@ const requiredByDLLConfig = module.parent.filename.includes(
2525
/**
2626
* Warn if the DLL is not built
2727
*/
28-
if (!requiredByDLLConfig && !(fs.existsSync(dllDir) && fs.existsSync(manifest))) {
28+
if (
29+
!requiredByDLLConfig &&
30+
!(fs.existsSync(dllDir) && fs.existsSync(manifest))
31+
) {
2932
console.log(
3033
chalk.black.bgYellow.bold(
3134
'The DLL files are missing. Sit back while we build them for you with "yarn build-dll"'
@@ -61,9 +64,7 @@ export default merge(baseConfig, {
6164
{
6265
loader: require.resolve('babel-loader'),
6366
options: {
64-
plugins: [
65-
require.resolve('react-refresh/babel'),
66-
].filter(Boolean),
67+
plugins: [require.resolve('react-refresh/babel')].filter(Boolean),
6768
},
6869
},
6970
],
@@ -211,7 +212,6 @@ export default merge(baseConfig, {
211212
],
212213
},
213214
plugins: [
214-
215215
requiredByDLLConfig
216216
? null
217217
: new webpack.DllReferencePlugin({
@@ -272,13 +272,13 @@ export default merge(baseConfig, {
272272
},
273273
before() {
274274
console.log('Starting Main Process...');
275-
spawn('npm', ['run', 'start:main'], {
276-
shell: true,
277-
env: process.env,
278-
stdio: 'inherit',
279-
})
280-
.on('close', (code) => process.exit(code))
281-
.on('error', (spawnError) => console.error(spawnError));
275+
spawn('npm', ['run', 'start:main'], {
276+
shell: true,
277+
env: process.env,
278+
stdio: 'inherit',
279+
})
280+
.on('close', (code) => process.exit(code))
281+
.on('error', (spawnError) => console.error(spawnError));
282282
},
283283
},
284284
});

‎.husky/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npm run lint staged

‎graphql.schema.json

+14-4
Original file line numberDiff line numberDiff line change
@@ -2376,7 +2376,11 @@
23762376
"name": "include",
23772377
"description": "Directs the executor to include this field or fragment only when the `if` argument is true.",
23782378
"isRepeatable": false,
2379-
"locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
2379+
"locations": [
2380+
"FIELD",
2381+
"FRAGMENT_SPREAD",
2382+
"INLINE_FRAGMENT"
2383+
],
23802384
"args": [
23812385
{
23822386
"name": "if",
@@ -2400,7 +2404,11 @@
24002404
"name": "skip",
24012405
"description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
24022406
"isRepeatable": false,
2403-
"locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
2407+
"locations": [
2408+
"FIELD",
2409+
"FRAGMENT_SPREAD",
2410+
"INLINE_FRAGMENT"
2411+
],
24042412
"args": [
24052413
{
24062414
"name": "if",
@@ -2449,7 +2457,9 @@
24492457
"name": "specifiedBy",
24502458
"description": "Exposes a URL that specifies the behaviour of this scalar.",
24512459
"isRepeatable": false,
2452-
"locations": ["SCALAR"],
2460+
"locations": [
2461+
"SCALAR"
2462+
],
24532463
"args": [
24542464
{
24552465
"name": "url",
@@ -2471,4 +2481,4 @@
24712481
}
24722482
]
24732483
}
2474-
}
2484+
}

‎package.json

+57-65
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/BabelRegister ./src/main.dev.ts",
1515
"start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js",
1616
"test": "jest --passWithNoTests",
17-
"gql-codegen": "graphql-codegen --config codegen.yml"
17+
"gql-codegen": "graphql-codegen --config codegen.yml",
18+
"prepare": "husky install"
1819
},
1920
"author": {
2021
"name": "ExpressLRS Configurator Contributors",
@@ -179,50 +180,50 @@
179180
]
180181
},
181182
"devDependencies": {
182-
"@babel/core": "^7.12.16",
183-
"@babel/plugin-proposal-class-properties": "^7.12.1",
184-
"@babel/plugin-proposal-decorators": "^7.12.13",
183+
"@babel/core": "^7.13.14",
184+
"@babel/plugin-proposal-class-properties": "^7.13.0",
185+
"@babel/plugin-proposal-decorators": "^7.13.5",
185186
"@babel/plugin-proposal-do-expressions": "^7.12.13",
186187
"@babel/plugin-proposal-export-default-from": "^7.12.13",
187188
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
188189
"@babel/plugin-proposal-function-bind": "^7.12.13",
189190
"@babel/plugin-proposal-function-sent": "^7.12.13",
190-
"@babel/plugin-proposal-json-strings": "^7.12.13",
191-
"@babel/plugin-proposal-logical-assignment-operators": "^7.12.13",
192-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.13",
193-
"@babel/plugin-proposal-optional-chaining": "^7.12.16",
191+
"@babel/plugin-proposal-json-strings": "^7.13.8",
192+
"@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
193+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
194+
"@babel/plugin-proposal-optional-chaining": "^7.13.12",
194195
"@babel/plugin-proposal-pipeline-operator": "^7.12.13",
195196
"@babel/plugin-proposal-throw-expressions": "^7.12.13",
196197
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
197198
"@babel/plugin-syntax-import-meta": "^7.10.4",
198-
"@babel/plugin-transform-react-constant-elements": "^7.12.13",
199+
"@babel/plugin-transform-react-constant-elements": "^7.13.13",
199200
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
200-
"@babel/plugin-transform-runtime": "^7.12.15",
201-
"@babel/preset-env": "^7.12.16",
202-
"@babel/preset-react": "^7.12.13",
203-
"@babel/preset-typescript": "^7.12.16",
204-
"@babel/register": "^7.12.13",
205-
"@graphql-codegen/cli": "1.21.1",
201+
"@babel/plugin-transform-runtime": "^7.13.10",
202+
"@babel/preset-env": "^7.13.12",
203+
"@babel/preset-react": "^7.13.13",
204+
"@babel/preset-typescript": "^7.13.0",
205+
"@babel/register": "^7.13.14",
206+
"@graphql-codegen/cli": "1.21.3",
206207
"@graphql-codegen/introspection": "1.18.1",
207-
"@graphql-codegen/typescript": "1.21.0",
208-
"@graphql-codegen/typescript-operations": "^1.17.14",
209-
"@graphql-codegen/typescript-react-apollo": "2.2.1",
208+
"@graphql-codegen/typescript": "1.21.1",
209+
"@graphql-codegen/typescript-operations": "^1.17.15",
210+
"@graphql-codegen/typescript-react-apollo": "2.2.3",
210211
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
211-
"@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
212-
"@testing-library/jest-dom": "^5.11.9",
213-
"@testing-library/react": "^11.2.5",
212+
"@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
213+
"@testing-library/jest-dom": "^5.11.10",
214+
"@testing-library/react": "^11.2.6",
214215
"@types/autosuggest-highlight": "^3.1.1",
215216
"@types/cross-spawn": "^6.0.2",
216217
"@types/enzyme": "^3.10.5",
217218
"@types/enzyme-adapter-react-16": "^1.0.6",
218219
"@types/history": "4.7.8",
219-
"@types/jest": "^26.0.20",
220+
"@types/jest": "^26.0.22",
220221
"@types/mkdirp": "^1.0.1",
221-
"@types/node": "14.14.31",
222-
"@types/react": "^17.0.1",
223-
"@types/react-dom": "^17.0.0",
222+
"@types/node": "14.14.37",
223+
"@types/react": "^17.0.3",
224+
"@types/react-dom": "^17.0.3",
224225
"@types/react-router-dom": "^5.1.7",
225-
"@types/react-test-renderer": "^17.0.0",
226+
"@types/react-test-renderer": "^17.0.1",
226227
"@types/rimraf": "^3.0.0",
227228
"@types/uuid": "^8.3.0",
228229
"@types/webpack-env": "^1.16.0",
@@ -233,53 +234,53 @@
233234
"babel-loader": "^8.2.2",
234235
"babel-plugin-dev-expression": "^0.2.2",
235236
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
236-
"babel-plugin-transform-typescript-metadata": "^0.3.1",
237+
"babel-plugin-transform-typescript-metadata": "^0.3.2",
237238
"browserslist-config-erb": "^0.0.1",
238239
"chalk": "^4.1.0",
239-
"concurrently": "^5.3.0",
240-
"core-js": "^3.9.1",
240+
"concurrently": "^6.0.1",
241+
"core-js": "^3.10.1",
241242
"cross-env": "^7.0.3",
242-
"css-loader": "^5.0.2",
243-
"css-minimizer-webpack-plugin": "^1.1.5",
243+
"css-loader": "^5.2.0",
244+
"css-minimizer-webpack-plugin": "^1.3.0",
244245
"detect-port": "^1.3.0",
245-
"electron": "^12.0.0",
246+
"electron": "^12.0.2",
246247
"electron-builder": "^22.10.5",
247248
"electron-devtools-installer": "^3.1.1",
248249
"electron-notarize": "^1.0.0",
249250
"electron-rebuild": "^2.3.5",
250251
"enzyme": "^3.11.0",
251-
"enzyme-adapter-react-16": "^1.15.3",
252+
"enzyme-adapter-react-16": "^1.15.6",
252253
"enzyme-to-json": "^3.5.0",
253-
"eslint": "^7.5.0",
254+
"eslint": "^7.23.0",
254255
"eslint-config-airbnb": "^18.2.0",
255-
"eslint-config-airbnb-typescript": "^12.0.0",
256+
"eslint-config-airbnb-typescript": "^12.3.1",
256257
"eslint-config-erb": "^2.0.0",
257258
"eslint-config-prettier": "^6.11.0",
258259
"eslint-import-resolver-webpack": "^0.13.0",
259-
"eslint-plugin-compat": "^3.8.0",
260+
"eslint-plugin-compat": "^3.9.0",
260261
"eslint-plugin-import": "^2.22.0",
261-
"eslint-plugin-jest": "^24.1.3",
262+
"eslint-plugin-jest": "^24.3.4",
262263
"eslint-plugin-jsx-a11y": "6.4.1",
263-
"eslint-plugin-prettier": "^3.1.4",
264-
"eslint-plugin-promise": "^4.2.1",
265-
"eslint-plugin-react": "^7.20.6",
264+
"eslint-plugin-prettier": "^3.3.1",
265+
"eslint-plugin-promise": "^4.3.1",
266+
"eslint-plugin-react": "^7.23.1",
266267
"eslint-plugin-react-hooks": "^4.0.8",
267268
"file-loader": "^6.0.0",
268-
"husky": "^4.3.8",
269+
"husky": "^6.0.0",
269270
"identity-obj-proxy": "^3.0.0",
270271
"jest": "^26.1.0",
271272
"lint-staged": "^10.5.4",
272-
"mini-css-extract-plugin": "^1.3.6",
273+
"mini-css-extract-plugin": "^1.4.1",
273274
"node-sass": "^5.0.0",
274275
"opencollective-postinstall": "^2.0.3",
275276
"prettier": "^2.2.1",
276277
"react-refresh": "^0.9.0",
277-
"react-test-renderer": "^17.0.1",
278+
"react-test-renderer": "^17.0.2",
278279
"rimraf": "^3.0.2",
279-
"sass-loader": "^10.1.1",
280+
"sass-loader": "^11.0.1",
280281
"style-loader": "^2.0.0",
281282
"terser-webpack-plugin": "^5.1.1",
282-
"typescript": "^4.2.2",
283+
"typescript": "^4.2.4",
283284
"url-loader": "^4.1.0",
284285
"webpack": "^5.5.1",
285286
"webpack-bundle-analyzer": "^4.1.0",
@@ -288,39 +289,35 @@
288289
"webpack-merge": "^5.7.3",
289290
"yarn-deduplicate": "^3.1.0"
290291
},
291-
"resolutions": {
292-
"@types/react": "17.0.0"
293-
},
294292
"dependencies": {
295-
"@apollo/client": "^3.3.11",
293+
"@apollo/client": "^3.3.14",
296294
"@emotion/react": "^11.1.5",
297295
"@emotion/styled": "^11.1.5",
298-
"@fontsource/roboto": "^4.2.1",
296+
"@fontsource/roboto": "^4.2.2",
299297
"@hapi/joi": "^17.1.1",
300298
"@material-ui/core": "^5.0.0-alpha.23",
301299
"@material-ui/icons": "^4.11.2",
302-
"@octokit/rest": "^18.3.1",
303-
"apollo-server-express": "^2.21.0",
300+
"@octokit/rest": "^18.5.2",
301+
"apollo-server-express": "^2.22.2",
304302
"autosuggest-highlight": "^3.1.1",
305303
"class-validator": "^0.13.1",
306304
"cross-spawn": "^7.0.3",
307-
"electron-debug": "^3.1.0",
308-
"electron-log": "^4.3.1",
309-
"electron-store": "^7.0.2",
305+
"electron-debug": "^3.2.0",
306+
"electron-log": "^4.3.3",
310307
"electron-updater": "^4.3.8",
311308
"express": "^4.17.1",
312309
"extract-zip": "^2.0.1",
313310
"get-port": "^5.1.1",
314311
"graphql": "15.5.0",
315-
"graphql-subscriptions": "^1.2.0",
312+
"graphql-subscriptions": "^1.2.1",
316313
"history": "^5.0.0",
317314
"http": "^0.0.1-security",
318315
"mkdirp": "^1.0.4",
319316
"node-fetch": "^2.6.1",
320-
"quick-score": "^0.0.10",
321-
"react": "^17.0.1",
322-
"react-dom": "^17.0.1",
323-
"react-intl": "^5.13.2",
317+
"quick-score": "^0.0.11",
318+
"react": "^17.0.2",
319+
"react-dom": "^17.0.2",
320+
"react-intl": "^5.15.7",
324321
"react-router-dom": "^5.2.0",
325322
"reflect-metadata": "^0.1.13",
326323
"regenerator-runtime": "^0.13.5",
@@ -358,10 +355,5 @@
358355
"baseBranches": [
359356
"next"
360357
]
361-
},
362-
"husky": {
363-
"hooks": {
364-
"pre-commit": "lint-staged"
365-
}
366358
}
367359
}

‎src/ui/gql/generated/types.ts

+25-12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
99
{ [SubKey in K]?: Maybe<T[SubKey]> };
1010
export type MakeMaybe<T, K extends keyof T> = Omit<T, K> &
1111
{ [SubKey in K]: Maybe<T[SubKey]> };
12+
const defaultOptions = {};
1213
/** All built-in and custom scalars, mapped to their actual values */
1314
export type Scalars = {
1415
ID: string;
@@ -349,10 +350,11 @@ export function useAvailableFirmwareTargetsQuery(
349350
AvailableFirmwareTargetsQueryVariables
350351
>
351352
) {
353+
const options = { ...defaultOptions, ...baseOptions };
352354
return Apollo.useQuery<
353355
AvailableFirmwareTargetsQuery,
354356
AvailableFirmwareTargetsQueryVariables
355-
>(AvailableFirmwareTargetsDocument, baseOptions);
357+
>(AvailableFirmwareTargetsDocument, options);
356358
}
357359

358360
export function useAvailableFirmwareTargetsLazyQuery(
@@ -361,10 +363,11 @@ export function useAvailableFirmwareTargetsLazyQuery(
361363
AvailableFirmwareTargetsQueryVariables
362364
>
363365
) {
366+
const options = { ...defaultOptions, ...baseOptions };
364367
return Apollo.useLazyQuery<
365368
AvailableFirmwareTargetsQuery,
366369
AvailableFirmwareTargetsQueryVariables
367-
>(AvailableFirmwareTargetsDocument, baseOptions);
370+
>(AvailableFirmwareTargetsDocument, options);
368371
}
369372

370373
export type AvailableFirmwareTargetsQueryHookResult = ReturnType<
@@ -415,10 +418,11 @@ export function useBuildFlashFirmwareMutation(
415418
BuildFlashFirmwareMutationVariables
416419
>
417420
) {
421+
const options = { ...defaultOptions, ...baseOptions };
418422
return Apollo.useMutation<
419423
BuildFlashFirmwareMutation,
420424
BuildFlashFirmwareMutationVariables
421-
>(BuildFlashFirmwareDocument, baseOptions);
425+
>(BuildFlashFirmwareDocument, options);
422426
}
423427

424428
export type BuildFlashFirmwareMutationHookResult = ReturnType<
@@ -458,10 +462,11 @@ export function useBuildLogUpdatesSubscription(
458462
BuildLogUpdatesSubscriptionVariables
459463
>
460464
) {
465+
const options = { ...defaultOptions, ...baseOptions };
461466
return Apollo.useSubscription<
462467
BuildLogUpdatesSubscription,
463468
BuildLogUpdatesSubscriptionVariables
464-
>(BuildLogUpdatesDocument, baseOptions);
469+
>(BuildLogUpdatesDocument, options);
465470
}
466471

467472
export type BuildLogUpdatesSubscriptionHookResult = ReturnType<
@@ -499,10 +504,11 @@ export function useBuildProgressNotificationsSubscription(
499504
BuildProgressNotificationsSubscriptionVariables
500505
>
501506
) {
507+
const options = { ...defaultOptions, ...baseOptions };
502508
return Apollo.useSubscription<
503509
BuildProgressNotificationsSubscription,
504510
BuildProgressNotificationsSubscriptionVariables
505-
>(BuildProgressNotificationsDocument, baseOptions);
511+
>(BuildProgressNotificationsDocument, options);
506512
}
507513

508514
export type BuildProgressNotificationsSubscriptionHookResult = ReturnType<
@@ -544,10 +550,11 @@ export function useClearPlatformioCoreDirMutation(
544550
ClearPlatformioCoreDirMutationVariables
545551
>
546552
) {
553+
const options = { ...defaultOptions, ...baseOptions };
547554
return Apollo.useMutation<
548555
ClearPlatformioCoreDirMutation,
549556
ClearPlatformioCoreDirMutationVariables
550-
>(ClearPlatformioCoreDirDocument, baseOptions);
557+
>(ClearPlatformioCoreDirDocument, options);
551558
}
552559

553560
export type ClearPlatformioCoreDirMutationHookResult = ReturnType<
@@ -611,10 +618,11 @@ export function useTargetDeviceOptionsQuery(
611618
TargetDeviceOptionsQueryVariables
612619
>
613620
) {
621+
const options = { ...defaultOptions, ...baseOptions };
614622
return Apollo.useQuery<
615623
TargetDeviceOptionsQuery,
616624
TargetDeviceOptionsQueryVariables
617-
>(TargetDeviceOptionsDocument, baseOptions);
625+
>(TargetDeviceOptionsDocument, options);
618626
}
619627

620628
export function useTargetDeviceOptionsLazyQuery(
@@ -623,10 +631,11 @@ export function useTargetDeviceOptionsLazyQuery(
623631
TargetDeviceOptionsQueryVariables
624632
>
625633
) {
634+
const options = { ...defaultOptions, ...baseOptions };
626635
return Apollo.useLazyQuery<
627636
TargetDeviceOptionsQuery,
628637
TargetDeviceOptionsQueryVariables
629-
>(TargetDeviceOptionsDocument, baseOptions);
638+
>(TargetDeviceOptionsDocument, options);
630639
}
631640

632641
export type TargetDeviceOptionsQueryHookResult = ReturnType<
@@ -666,9 +675,10 @@ export function useGetBranchesQuery(
666675
GetBranchesQueryVariables
667676
>
668677
) {
678+
const options = { ...defaultOptions, ...baseOptions };
669679
return Apollo.useQuery<GetBranchesQuery, GetBranchesQueryVariables>(
670680
GetBranchesDocument,
671-
baseOptions
681+
options
672682
);
673683
}
674684

@@ -678,9 +688,10 @@ export function useGetBranchesLazyQuery(
678688
GetBranchesQueryVariables
679689
>
680690
) {
691+
const options = { ...defaultOptions, ...baseOptions };
681692
return Apollo.useLazyQuery<GetBranchesQuery, GetBranchesQueryVariables>(
682693
GetBranchesDocument,
683-
baseOptions
694+
options
684695
);
685696
}
686697

@@ -716,18 +727,20 @@ export const GetTagsDocument = gql`
716727
export function useGetTagsQuery(
717728
baseOptions?: Apollo.QueryHookOptions<GetTagsQuery, GetTagsQueryVariables>
718729
) {
730+
const options = { ...defaultOptions, ...baseOptions };
719731
return Apollo.useQuery<GetTagsQuery, GetTagsQueryVariables>(
720732
GetTagsDocument,
721-
baseOptions
733+
options
722734
);
723735
}
724736

725737
export function useGetTagsLazyQuery(
726738
baseOptions?: Apollo.LazyQueryHookOptions<GetTagsQuery, GetTagsQueryVariables>
727739
) {
740+
const options = { ...defaultOptions, ...baseOptions };
728741
return Apollo.useLazyQuery<GetTagsQuery, GetTagsQueryVariables>(
729742
GetTagsDocument,
730-
baseOptions
743+
options
731744
);
732745
}
733746

‎yarn.lock

+1,328-1,354
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.