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
pybricks · Nov 21, 2020 · 88d4fe5 · 88d4fe5
1 parent b917554
commit 88d4fe5
Show file tree

Hide file tree

Showing 8 changed files with 2,968 additions and 2,513 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
         "react-dom": "^16.13.1",
         "react-dropzone": "^11.0.1",
         "react-redux": "^7.2.1",
-        "react-scripts": "3.4.1",
+        "react-scripts": "4.0.0",
         "react-splitter-layout": "^4.0.0",
         "redux": "^4.0.5",
         "redux-logger": "^3.0.6",
@@ -59,19 +59,18 @@
             "not op_mini all"
         ],
         "development": [
-            "last 1 chrome version",
+            "chrome 79",
             "last 1 firefox version",
             "last 1 safari version"
         ]
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^2.34.0",
-        "@typescript-eslint/parser": "^2.34.0",
-        "eslint": "^6.8.0",
-        "eslint-config-prettier": "^6.10.1",
-        "eslint-plugin-import": "^2.20.2",
-        "eslint-plugin-prettier": "^3.1.2",
-        "eslint-plugin-react": "^7.20.5",
+        "@typescript-eslint/eslint-plugin": "^4.8.1",
+        "@typescript-eslint/parser": "^4.8.1",
+        "eslint-config-prettier": "^6.15.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-prettier": "^3.1.4",
+        "eslint-plugin-react": "^7.21.5",
         "jest-mock-extended": "^1.0.9",
         "mkdirp": "^1.0.4",
         "ncp": "^2.0.0",

diff --git a/src/actions/ble.ts b/src/actions/ble.ts
@@ -61,25 +61,15 @@ type Reason<T extends BleDeviceFailToConnectReasonType> = {
     reason: T;
 };
 
-export type BleDeviceFailToConnectNoWebBluetoothReason = Reason<
-    BleDeviceFailToConnectReasonType.NoWebBluetooth
->;
+export type BleDeviceFailToConnectNoWebBluetoothReason = Reason<BleDeviceFailToConnectReasonType.NoWebBluetooth>;
 
-export type BleDeviceFailToConnectCanceledReason = Reason<
-    BleDeviceFailToConnectReasonType.Canceled
->;
+export type BleDeviceFailToConnectCanceledReason = Reason<BleDeviceFailToConnectReasonType.Canceled>;
 
-export type BleDeviceFailToConnectNoGattReason = Reason<
-    BleDeviceFailToConnectReasonType.NoGatt
->;
+export type BleDeviceFailToConnectNoGattReason = Reason<BleDeviceFailToConnectReasonType.NoGatt>;
 
-export type BleDeviceFailToConnectNoServiceReason = Reason<
-    BleDeviceFailToConnectReasonType.NoService
->;
+export type BleDeviceFailToConnectNoServiceReason = Reason<BleDeviceFailToConnectReasonType.NoService>;
 
-export type BleDeviceFailToConnectUnknownReason = Reason<
-    BleDeviceFailToConnectReasonType.Unknown
-> & {
+export type BleDeviceFailToConnectUnknownReason = Reason<BleDeviceFailToConnectReasonType.Unknown> & {
     err: Error;
 };
 
@@ -90,9 +80,7 @@ export type BleDeviceDidFailToConnectReason =
     | BleDeviceFailToConnectNoServiceReason
     | BleDeviceFailToConnectUnknownReason;
 
-export type BleDeviceDidFailToConnectAction = Action<
-    BleDeviceActionType.DidFailToConnect
-> &
+export type BleDeviceDidFailToConnectAction = Action<BleDeviceActionType.DidFailToConnect> &
     BleDeviceDidFailToConnectReason;
 
 /**

diff --git a/public/static/beta.svg → src/beta.svg b/public/static/beta.svg → src/beta.svg
diff --git a/src/components/editor-snippets.ts b/src/components/editor-snippets.ts
@@ -11,14 +11,13 @@ declare module 'ace-builds' {
     export function require(name: string[], callback: (module: any) => void): any;
 }
 
-ace.define('ace/snippets/python', ['require', 'exports', 'module'], function (
-    _require,
-    exports,
-    _module,
-) {
-    // IMPORTANT!!!!!
-    // Snippets must be indented with tab character, not spaces!
-    exports.snippetText = `snippet technichub
+ace.define(
+    'ace/snippets/python',
+    ['require', 'exports', 'module'],
+    function (_require, exports, _module) {
+        // IMPORTANT!!!!!
+        // Snippets must be indented with tab character, not spaces!
+        exports.snippetText = `snippet technichub
 	from pybricks.hubs import TechnicHub
 	from pybricks.pupdevices import Motor
 	from pybricks.parameters import Port, Stop
@@ -144,8 +143,9 @@ snippet "
 	\${1:doc}
 	"""
 `;
-    exports.scope = 'python';
-});
+        exports.scope = 'python';
+    },
+);
 
 (function (): void {
     ace.require(['ace/snippets/python'], function (m: any) {

diff --git a/src/index.scss b/src/index.scss
@@ -100,7 +100,7 @@ body {
 
 .watermark::after {
     content: "";
-    background: url("/static/beta.svg");
+    background: url("./beta.svg");
     opacity: 1;
     top: 0;
     left: 0;

diff --git a/test/env.js b/test/env.js
@@ -14,5 +14,9 @@ module.exports = class CustomTestEnvironment extends Environment {
         if (this.global.TextDecoder === undefined) {
             this.global.TextDecoder = TextDecoder;
         }
+
+        // work around https://github.com/facebook/jest/issues/7780
+        this.global.Uint8Array = Uint8Array;
+        this.global.ArrayBuffer = ArrayBuffer;
     }
 };
diff --git a/tsconfig.json b/tsconfig.json
@@ -15,7 +15,8 @@
         "noEmit": true,
         "jsx": "react",
         "downlevelIteration": true,
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "noFallthroughCasesInSwitch": true
     },
     "include": ["src", "test"]
 }