From e2bd33763f7587ad5c79de0eed1744db1b7e1dea Mon Sep 17 00:00:00 2001 From: Joe Date: Sat, 17 Feb 2024 13:11:56 -0500 Subject: [PATCH 1/2] ADD edge to compatible browsers --- web/src/components/shared/DeviceWarning.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/shared/DeviceWarning.jsx b/web/src/components/shared/DeviceWarning.jsx index 5c5183a35..1cc1315e6 100644 --- a/web/src/components/shared/DeviceWarning.jsx +++ b/web/src/components/shared/DeviceWarning.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {browserName, isChrome, isDesktop, isFirefox, isTablet} from 'react-device-detect'; +import {browserName, isChrome, isEdgeChromium, isDesktop, isFirefox, isTablet} from 'react-device-detect'; import {useSnackbar} from 'notistack'; export default function DeviceWarning() { @@ -7,11 +7,11 @@ export default function DeviceWarning() { React.useEffect(() => { const acceptDevice = isDesktop || isTablet; - const acceptBrowser = isChrome || isFirefox; + const acceptBrowser = isChrome || isFirefox || isEdgeChromium; if (!acceptBrowser) { enqueueSnackbar(`We noticed you are on ${browserName}. ` + 'Some things may not work as intended. ' + - 'Try Firefox or Chrome if you run into any issues!', {variant: 'warning'}); + 'Try Firefox, Chrome or Edge if you run into any issues!', {variant: 'warning'}); return; } if (!acceptDevice) { From 3a3fc32893e7347724792b3212cab80026a64304 Mon Sep 17 00:00:00 2001 From: John McCann Cunniff Jr Date: Mon, 19 Feb 2024 19:14:29 -0500 Subject: [PATCH 2/2] CHG disable annoying eslint --- .github/workflows/pull-request.yml | 4 ++-- web/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d48d0a360..7d49f8716 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -57,7 +57,7 @@ jobs: working-directory: web strategy: matrix: - node-version: [ 14.x ] + node-version: [ 16.x ] steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} @@ -75,4 +75,4 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - run: yarn install --frozen-lockfile - - run: yarn run build + - run: env DISABLE_ESLINT_PLUGIN=true yarn run build diff --git a/web/Dockerfile b/web/Dockerfile index 06a228ca9..f1e02f01b 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,7 +2,7 @@ FROM node:18-alpine # This disables webpack source maps from being created in the build step -ENV GENERATE_SOURCEMAP=false +ENV GENERATE_SOURCEMAP=false DISABLE_ESLINT_PLUGIN=true WORKDIR /opt/app COPY package.json yarn.lock /opt/app/