Merge pull request #350 from lightninglabs/update-cra

deps: update react-scripts to v5.0.0

Author: jamaljsr

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node_version: [12.x]
+        node_version: [16.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
@@ -109,10 +109,10 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-yarn-12.x-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-yarn-16.x-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-12.x-${{ hashFiles('**/yarn.lock') }}
-            ${{ runner.os }}-yarn-12.x-
+            ${{ runner.os }}-yarn-16.x-${{ hashFiles('**/yarn.lock') }}
+            ${{ runner.os }}-yarn-16.x-
             ${{ runner.os }}-yarn-
 
       - name: setup go v${{ matrix.go_version }}
@@ -138,10 +138,10 @@ jobs:
       - name: git checkout
         uses: actions/checkout@v2
 
-      - name: setup nodejs v${{ matrix.node_version }}
+      - name: setup nodejs v16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: download cache
         uses: actions/cache@v1
@@ -192,7 +192,7 @@ jobs:
       - name: setup nodejs v${{ matrix.node_version }}
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: download cache
         uses: actions/cache@v1

Dockerfile

@@ -1,5 +1,5 @@
 # Start with a NodeJS base image that also contains yarn.
-FROM node:12.17.0-alpine as nodejsbuilder
+FROM node:16.14.2-alpine as nodejsbuilder
 
 # Pass a tag, branch or a commit using build-arg. This allows a docker image to
 # be built from a specified Git state. The default image will use the Git tip of
@@ -20,8 +20,8 @@ ARG public_url=""
 #      be mitigated by switching to HTTP and increasing the network timeout.
 #      See https://github.com/yarnpkg/yarn/issues/5259 for more info.
 RUN apk add --no-cache --update alpine-sdk \
-    python \
-    git \
+  python \
+  git \
   && git clone https://github.com/lightninglabs/lightning-terminal /go/src/github.com/lightninglabs/lightning-terminal \
   && cd /go/src/github.com/lightninglabs/lightning-terminal \
   && git checkout $checkout \
@@ -51,7 +51,7 @@ ENV GO111MODULE on
 
 # Install dependencies and install/build lightning-terminal.
 RUN apk add --no-cache --update alpine-sdk \
-    make \
+  make \
   && cd /go/src/github.com/lightninglabs/lightning-terminal \
   && make go-install PUBLIC_URL=$public_url \
   && make go-install-cli
@@ -75,9 +75,9 @@ COPY --from=golangbuilder /go/bin/pool /bin/
 
 # Add bash.
 RUN apk add --no-cache \
-    bash \
-    jq \
-    ca-certificates
+  bash \
+  jq \
+  ca-certificates
 
 # Specify the start command and entrypoint as the lightning-terminal daemon.
 ENTRYPOINT ["litd"]

app/.eslintrc

@@ -3,7 +3,6 @@
   "extends": [
     "plugin:react/recommended", // Uses the recommended rules from @eslint-plugin-react
     "plugin:@typescript-eslint/recommended", // Uses the recommended rules from @typescript-eslint/eslint-plugin
-    "prettier/@typescript-eslint", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
     "plugin:prettier/recommended" // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
   ],
   "parserOptions": {

app/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "start": "BROWSER=none react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jest-environment-jsdom-sixteen",
+    "test": "react-scripts test --env=jest-environment-jsdom",
     "test:ci": "cross-env CI=true yarn test --coverage",
     "eject": "react-scripts eject",
     "lint": "eslint --ext .ts,.tsx --ignore-path .eslintignore .",
@@ -22,6 +22,7 @@
     "@improbable-eng/grpc-web": "0.14.0",
     "big.js": "6.1.1",
     "bootstrap": "4.6.1",
+    "buffer": "6.0.3",
     "copy-to-clipboard": "3.3.1",
     "d3": "6.3.1",
     "date-fns": "2.14.0",
@@ -42,7 +43,7 @@
     "react-dom": "17.0.2",
     "react-i18next": "11.7.0",
     "react-router": "5.2.0",
-    "react-scripts": "4.0.2",
+    "react-scripts": "5.0.0",
     "react-toastify": "6.0.6",
     "react-virtualized": "9.21.2",
     "reactour": "1.18.0",
@@ -64,28 +65,31 @@
     "@types/file-saver": "2.0.1",
     "@types/google-protobuf": "3.7.2",
     "@types/history": "4.7.6",
-    "@types/jest": "26.0.3",
+    "@types/jest": "27.4.1",
     "@types/lodash": "4.14.157",
     "@types/node": "14.0.14",
     "@types/react": "17.0.13",
     "@types/react-dom": "17.0.8",
     "@types/react-router": "5.1.8",
     "@types/react-virtualized": "9.21.10",
     "@types/reactour": "1.17.1",
-    "@typescript-eslint/eslint-plugin": "4.7.0",
-    "@typescript-eslint/parser": "4.7.0",
+    "@typescript-eslint/eslint-plugin": "5.17.0",
+    "@typescript-eslint/parser": "5.17.0",
     "cross-env": "7.0.2",
-    "eslint-config-prettier": "6.15.0",
-    "eslint-plugin-prettier": "3.1.4",
-    "eslint-plugin-react": "7.21.5",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-react": "7.29.4",
     "google-protobuf": "3.12.2",
     "jest-canvas-mock": "2.3.0",
-    "jest-environment-jsdom-sixteen": "1.0.3",
+    "jest-environment-jsdom": "27.5.1",
     "prettier": "2.1.2",
     "sass": "1.43.4",
     "ts-protoc-gen": "0.12.0",
     "typescript": "4.1.6"
   },
+  "resolutions": {
+    "history": "4.10.1"
+  },
   "eslintConfig": {
     "extends": "react-app",
     "ignorePatterns": [

app/src/__tests__/components/pool/BatchStats.spec.tsx

@@ -33,7 +33,7 @@ describe('BatchStats', () => {
     expect(getByText('1m 30s')).toBeInTheDocument();
 
     act(() => {
-      jest.runTimersToTime(1000);
+      jest.advanceTimersByTime(1000);
     });
     await waitFor(() => {
       expect(getByText('1m 29s')).toBeInTheDocument();

app/src/__tests__/store/batchStore.spec.ts

@@ -254,20 +254,22 @@ describe('BatchStore', () => {
     // allow polling in this test
     Object.defineProperty(config, 'IS_TEST', { get: () => false });
     jest.useFakeTimers();
+    jest.spyOn(global, 'setInterval');
 
     store.startPolling();
-    expect(window.setInterval).toBeCalled();
+    expect(setInterval).toBeCalled();
     expect(callCount).toBe(0);
     // fast forward 1 minute
-    jest.runTimersToTime(60 * 1000);
+    jest.advanceTimersByTime(60 * 1000);
     await waitFor(() => {
       expect(callCount).toBe(1);
     });
 
+    jest.spyOn(global, 'clearInterval');
     store.stopPolling();
-    expect(window.clearInterval).toBeCalled();
+    expect(clearInterval).toBeCalled();
     // fast forward 1 more minute
-    jest.runTimersToTime(120 * 1000);
+    jest.advanceTimersByTime(120 * 1000);
     expect(callCount).toBe(1);
 
     // revert IS_TEST

app/src/api/pool.ts

@@ -2,6 +2,7 @@ import * as AUCT from 'types/generated/auctioneerrpc/auctioneer_pb';
 import * as POOL from 'types/generated/trader_pb';
 import { Trader } from 'types/generated/trader_pb_service';
 import Big from 'big.js';
+import { Buffer } from 'buffer';
 import { b64 } from 'util/strings';
 import { OrderType, Tier } from 'store/models/order';
 import BaseApi from './base';

app/src/store/stores/authStore.ts

@@ -1,4 +1,5 @@
 import { makeAutoObservable, runInAction } from 'mobx';
+import { Buffer } from 'buffer';
 import { prefixTranslation } from 'util/translate';
 import { Store } from 'store';
 

app/src/util/strings.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer';
+
 /**
  * Shortens text by removing a portion of characters from the middle and only
  * keeping a small subset of the outer left and right sides