Skip to content

Commit 71ad9c1

Browse files
committed
Update to create-react-app 4
- had to update eslint deps - ran into palantir/blueprint#4112 - had to move beta.svg out of static/ - had to fix prettier formatting changes - ran into jestjs/jest#7780
1 parent b917554 commit 71ad9c1

File tree

13 files changed

+2996
-2585
lines changed

13 files changed

+2996
-2585
lines changed

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"react-dom": "^16.13.1",
3030
"react-dropzone": "^11.0.1",
3131
"react-redux": "^7.2.1",
32-
"react-scripts": "3.4.1",
32+
"react-scripts": "4.0.0",
3333
"react-splitter-layout": "^4.0.0",
3434
"redux": "^4.0.5",
3535
"redux-logger": "^3.0.6",
@@ -59,19 +59,18 @@
5959
"not op_mini all"
6060
],
6161
"development": [
62-
"last 1 chrome version",
62+
"chrome 79",
6363
"last 1 firefox version",
6464
"last 1 safari version"
6565
]
6666
},
6767
"devDependencies": {
68-
"@typescript-eslint/eslint-plugin": "^2.34.0",
69-
"@typescript-eslint/parser": "^2.34.0",
70-
"eslint": "^6.8.0",
71-
"eslint-config-prettier": "^6.10.1",
72-
"eslint-plugin-import": "^2.20.2",
73-
"eslint-plugin-prettier": "^3.1.2",
74-
"eslint-plugin-react": "^7.20.5",
68+
"@typescript-eslint/eslint-plugin": "^4.8.1",
69+
"@typescript-eslint/parser": "^4.8.1",
70+
"eslint-config-prettier": "^6.15.0",
71+
"eslint-plugin-import": "^2.22.1",
72+
"eslint-plugin-prettier": "^3.1.4",
73+
"eslint-plugin-react": "^7.21.5",
7574
"jest-mock-extended": "^1.0.9",
7675
"mkdirp": "^1.0.4",
7776
"ncp": "^2.0.0",

src/actions/ble.ts

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,15 @@ type Reason<T extends BleDeviceFailToConnectReasonType> = {
6161
reason: T;
6262
};
6363

64-
export type BleDeviceFailToConnectNoWebBluetoothReason = Reason<
65-
BleDeviceFailToConnectReasonType.NoWebBluetooth
66-
>;
64+
export type BleDeviceFailToConnectNoWebBluetoothReason = Reason<BleDeviceFailToConnectReasonType.NoWebBluetooth>;
6765

68-
export type BleDeviceFailToConnectCanceledReason = Reason<
69-
BleDeviceFailToConnectReasonType.Canceled
70-
>;
66+
export type BleDeviceFailToConnectCanceledReason = Reason<BleDeviceFailToConnectReasonType.Canceled>;
7167

72-
export type BleDeviceFailToConnectNoGattReason = Reason<
73-
BleDeviceFailToConnectReasonType.NoGatt
74-
>;
68+
export type BleDeviceFailToConnectNoGattReason = Reason<BleDeviceFailToConnectReasonType.NoGatt>;
7569

76-
export type BleDeviceFailToConnectNoServiceReason = Reason<
77-
BleDeviceFailToConnectReasonType.NoService
78-
>;
70+
export type BleDeviceFailToConnectNoServiceReason = Reason<BleDeviceFailToConnectReasonType.NoService>;
7971

80-
export type BleDeviceFailToConnectUnknownReason = Reason<
81-
BleDeviceFailToConnectReasonType.Unknown
82-
> & {
72+
export type BleDeviceFailToConnectUnknownReason = Reason<BleDeviceFailToConnectReasonType.Unknown> & {
8373
err: Error;
8474
};
8575

@@ -90,9 +80,7 @@ export type BleDeviceDidFailToConnectReason =
9080
| BleDeviceFailToConnectNoServiceReason
9181
| BleDeviceFailToConnectUnknownReason;
9282

93-
export type BleDeviceDidFailToConnectAction = Action<
94-
BleDeviceActionType.DidFailToConnect
95-
> &
83+
export type BleDeviceDidFailToConnectAction = Action<BleDeviceActionType.DidFailToConnect> &
9684
BleDeviceDidFailToConnectReason;
9785

9886
/**

src/actions/hub.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ export enum HubMessageActionType {
2222
Checksum = 'hub.message.action.runtime.checksum',
2323
}
2424

25-
export type HubRuntimeStatusMessageAction = Action<
26-
HubMessageActionType.RuntimeStatus
27-
> & {
25+
export type HubRuntimeStatusMessageAction = Action<HubMessageActionType.RuntimeStatus> & {
2826
readonly newStatus: HubRuntimeStatusType;
2927
};
3028

src/actions/lwp3-bootloader.ts

Lines changed: 21 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,13 @@ export enum BootloaderConnectionActionType {
4848
DidDisconnect = 'bootloader.action.connection.did.disconnect',
4949
}
5050

51-
export type BootloaderConnectionConnectAction = Action<
52-
BootloaderConnectionActionType.Connect
53-
>;
51+
export type BootloaderConnectionConnectAction = Action<BootloaderConnectionActionType.Connect>;
5452

5553
export function connect(): BootloaderConnectionConnectAction {
5654
return { type: BootloaderConnectionActionType.Connect };
5755
}
5856

59-
export type BootloaderConnectionDidConnectAction = Action<
60-
BootloaderConnectionActionType.DidConnect
61-
> & {
57+
export type BootloaderConnectionDidConnectAction = Action<BootloaderConnectionActionType.DidConnect> & {
6258
canWriteWithoutResponse: boolean;
6359
};
6460

@@ -82,9 +78,7 @@ export enum BootloaderConnectionFailureReason {
8278
GattServiceNotFound = 'gatt-service-not-found',
8379
}
8480

85-
export type BootloaderConnectionDidFailToConnectAction = Action<
86-
BootloaderConnectionActionType.DidFailToConnect
87-
> & {
81+
export type BootloaderConnectionDidFailToConnectAction = Action<BootloaderConnectionActionType.DidFailToConnect> & {
8882
reason: BootloaderConnectionFailureReason;
8983
err?: Error;
9084
};
@@ -96,19 +90,15 @@ export function didFailToConnect(
9690
return { type: BootloaderConnectionActionType.DidFailToConnect, reason, err };
9791
}
9892

99-
export type BootloaderConnectionDidErrorAction = Action<
100-
BootloaderConnectionActionType.DidError
101-
> & {
93+
export type BootloaderConnectionDidErrorAction = Action<BootloaderConnectionActionType.DidError> & {
10294
err: Error;
10395
};
10496

10597
export function didError(err: Error): BootloaderConnectionDidErrorAction {
10698
return { type: BootloaderConnectionActionType.DidError, err };
10799
}
108100

109-
export type BootloaderConnectionSendAction = Action<
110-
BootloaderConnectionActionType.Send
111-
> & {
101+
export type BootloaderConnectionSendAction = Action<BootloaderConnectionActionType.Send> & {
112102
readonly data: ArrayBuffer;
113103
readonly withResponse: boolean;
114104
};
@@ -120,29 +110,23 @@ export function send(
120110
return { type: BootloaderConnectionActionType.Send, data, withResponse };
121111
}
122112

123-
export type BootloaderConnectionDidSendAction = Action<
124-
BootloaderConnectionActionType.DidSend
125-
> & {
113+
export type BootloaderConnectionDidSendAction = Action<BootloaderConnectionActionType.DidSend> & {
126114
err?: Error;
127115
};
128116

129117
export function didSend(err?: Error): BootloaderConnectionDidSendAction {
130118
return { type: BootloaderConnectionActionType.DidSend, err };
131119
}
132120

133-
export type BootloaderConnectionDidReceiveAction = Action<
134-
BootloaderConnectionActionType.DidReceive
135-
> & {
121+
export type BootloaderConnectionDidReceiveAction = Action<BootloaderConnectionActionType.DidReceive> & {
136122
data: DataView;
137123
};
138124

139125
export function didReceive(data: DataView): BootloaderConnectionDidReceiveAction {
140126
return { type: BootloaderConnectionActionType.DidReceive, data };
141127
}
142128

143-
export type BootloaderConnectionDidDisconnectAction = Action<
144-
BootloaderConnectionActionType.DidDisconnect
145-
>;
129+
export type BootloaderConnectionDidDisconnectAction = Action<BootloaderConnectionActionType.DidDisconnect>;
146130

147131
export function didDisconnect(): BootloaderConnectionDidDisconnectAction {
148132
return { type: BootloaderConnectionActionType.DidDisconnect };
@@ -188,9 +172,7 @@ type BaseBootloaderRequestAction<T extends BootloaderRequestActionType> = Action
188172
/**
189173
* Action that requests to erase the flash memory.
190174
*/
191-
export type BootloaderEraseRequestAction = BaseBootloaderRequestAction<
192-
BootloaderRequestActionType.Erase
193-
>;
175+
export type BootloaderEraseRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Erase>;
194176

195177
/**
196178
* Creates a request to erase the flash memory.
@@ -202,9 +184,7 @@ export function eraseRequest(): BootloaderEraseRequestAction {
202184
/**
203185
* Action that requests to program the flash memory.
204186
*/
205-
export type BootloaderProgramRequestAction = BaseBootloaderRequestAction<
206-
BootloaderRequestActionType.Program
207-
> & {
187+
export type BootloaderProgramRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Program> & {
208188
address: number;
209189
payload: ArrayBuffer;
210190
};
@@ -229,9 +209,7 @@ export function programRequest(
229209
/**
230210
* Action that requests to reboot the hub.
231211
*/
232-
export type BootloaderRebootRequestAction = BaseBootloaderRequestAction<
233-
BootloaderRequestActionType.Reboot
234-
>;
212+
export type BootloaderRebootRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Reboot>;
235213

236214
/**
237215
* Creates a request to reboot the hub.
@@ -243,9 +221,7 @@ export function rebootRequest(): BootloaderRebootRequestAction {
243221
/**
244222
* Action that requests to initialize the firmware flashing process.
245223
*/
246-
export type BootloaderInitRequestAction = BaseBootloaderRequestAction<
247-
BootloaderRequestActionType.Init
248-
> & {
224+
export type BootloaderInitRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Init> & {
249225
firmwareSize: number;
250226
};
251227

@@ -264,9 +240,7 @@ export function initRequest(firmwareSize: number): BootloaderInitRequestAction {
264240
/**
265241
* Action that requests information about the hub.
266242
*/
267-
export type BootloaderInfoRequestAction = BaseBootloaderRequestAction<
268-
BootloaderRequestActionType.Info
269-
>;
243+
export type BootloaderInfoRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Info>;
270244

271245
/**
272246
* Creates a request to get information about the hub.
@@ -279,9 +253,7 @@ export function infoRequest(): BootloaderInfoRequestAction {
279253
* Action to get the checksum of the bytes that have been written to flash
280254
* so far.
281255
*/
282-
export type BootloaderChecksumRequestAction = BaseBootloaderRequestAction<
283-
BootloaderRequestActionType.Checksum
284-
>;
256+
export type BootloaderChecksumRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Checksum>;
285257

286258
/**
287259
* Creates a request to get the checksum of the bytes that have been written
@@ -294,9 +266,7 @@ export function checksumRequest(): BootloaderChecksumRequestAction {
294266
/**
295267
* Action that requests the bootloader flash memory protection state.
296268
*/
297-
export type BootloaderStateRequestAction = BaseBootloaderRequestAction<
298-
BootloaderRequestActionType.State
299-
>;
269+
export type BootloaderStateRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.State>;
300270

301271
/**
302272
* Creates a request to get the bootloader flash memory protection state.
@@ -308,9 +278,7 @@ export function stateRequest(): BootloaderStateRequestAction {
308278
/**
309279
* Action that requests to disconnect the hub.
310280
*/
311-
export type BootloaderDisconnectRequestAction = BaseBootloaderRequestAction<
312-
BootloaderRequestActionType.Disconnect
313-
>;
281+
export type BootloaderDisconnectRequestAction = BaseBootloaderRequestAction<BootloaderRequestActionType.Disconnect>;
314282

315283
/**
316284
* Creates a request to disconnect the hub.
@@ -378,19 +346,15 @@ export enum BootloaderResponseActionType {
378346
Error = 'bootloader.action.response.error',
379347
}
380348

381-
export type BootloaderEraseResponseAction = Action<
382-
BootloaderResponseActionType.Erase
383-
> & {
349+
export type BootloaderEraseResponseAction = Action<BootloaderResponseActionType.Erase> & {
384350
result: Result;
385351
};
386352

387353
export function eraseResponse(result: Result): BootloaderEraseResponseAction {
388354
return { type: BootloaderResponseActionType.Erase, result };
389355
}
390356

391-
export type BootloaderProgramResponseAction = Action<
392-
BootloaderResponseActionType.Program
393-
> & {
357+
export type BootloaderProgramResponseAction = Action<BootloaderResponseActionType.Program> & {
394358
checksum: number;
395359
count: number;
396360
};
@@ -432,29 +396,23 @@ export function infoResponse(
432396
};
433397
}
434398

435-
export type BootloaderChecksumResponseAction = Action<
436-
BootloaderResponseActionType.Checksum
437-
> & {
399+
export type BootloaderChecksumResponseAction = Action<BootloaderResponseActionType.Checksum> & {
438400
checksum: number;
439401
};
440402

441403
export function checksumResponse(checksum: number): BootloaderChecksumResponseAction {
442404
return { type: BootloaderResponseActionType.Checksum, checksum };
443405
}
444406

445-
export type BootloaderStateResponseAction = Action<
446-
BootloaderResponseActionType.State
447-
> & {
407+
export type BootloaderStateResponseAction = Action<BootloaderResponseActionType.State> & {
448408
level: ProtectionLevel;
449409
};
450410

451411
export function stateResponse(level: ProtectionLevel): BootloaderStateResponseAction {
452412
return { type: BootloaderResponseActionType.State, level };
453413
}
454414

455-
export type BootloaderErrorResponseAction = Action<
456-
BootloaderResponseActionType.Error
457-
> & {
415+
export type BootloaderErrorResponseAction = Action<BootloaderResponseActionType.Error> & {
458416
command: Command;
459417
};
460418

File renamed without changes.

src/components/editor-snippets.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ declare module 'ace-builds' {
1111
export function require(name: string[], callback: (module: any) => void): any;
1212
}
1313

14-
ace.define('ace/snippets/python', ['require', 'exports', 'module'], function (
15-
_require,
16-
exports,
17-
_module,
18-
) {
19-
// IMPORTANT!!!!!
20-
// Snippets must be indented with tab character, not spaces!
21-
exports.snippetText = `snippet technichub
14+
ace.define(
15+
'ace/snippets/python',
16+
['require', 'exports', 'module'],
17+
function (_require, exports, _module) {
18+
// IMPORTANT!!!!!
19+
// Snippets must be indented with tab character, not spaces!
20+
exports.snippetText = `snippet technichub
2221
from pybricks.hubs import TechnicHub
2322
from pybricks.pupdevices import Motor
2423
from pybricks.parameters import Port, Stop
@@ -144,8 +143,9 @@ snippet "
144143
\${1:doc}
145144
"""
146145
`;
147-
exports.scope = 'python';
148-
});
146+
exports.scope = 'python';
147+
},
148+
);
149149

150150
(function (): void {
151151
ace.require(['ace/snippets/python'], function (m: any) {

src/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ body {
100100

101101
.watermark::after {
102102
content: "";
103-
background: url("/static/beta.svg");
103+
background: url("./beta.svg");
104104
opacity: 1;
105105
top: 0;
106106
left: 0;

src/react-app-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference types="react-scripts" />
22

33
declare module '*.json' {
4-
const src: object;
4+
const src: unknown;
55
export default src;
66
}
77

src/sagas/terminal.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ function* receiveUartData(action: BleUartNotifyAction): Generator {
100100
}
101101

102102
function* receiveTerminalData(): Generator {
103-
const channel = (yield actionChannel(TerminalActionType.ReceivedData)) as Channel<
104-
TerminalDataReceiveDataAction
105-
>;
103+
const channel = (yield actionChannel(
104+
TerminalActionType.ReceivedData,
105+
)) as Channel<TerminalDataReceiveDataAction>;
106106
while (true) {
107107
// wait for input from terminal
108108
const action = (yield take(channel)) as TerminalDataReceiveDataAction;

test/env.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ module.exports = class CustomTestEnvironment extends Environment {
1414
if (this.global.TextDecoder === undefined) {
1515
this.global.TextDecoder = TextDecoder;
1616
}
17+
18+
// work around https://github.com/facebook/jest/issues/7780
19+
this.global.Uint8Array = Uint8Array;
20+
this.global.ArrayBuffer = ArrayBuffer;
1721
}
1822
};

0 commit comments

Comments
 (0)