Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD edge to compatible browsers #471

Merged
merged 2 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
2 changes: 1 addition & 1 deletion web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/shared/DeviceWarning.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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() {
const {enqueueSnackbar} = useSnackbar();

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) {
Expand Down
Loading