Skip to content
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
2 changes: 2 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
"react/jsx-indent": "off",
"react/jsx-one-expression-per-line": "off",
"react/jsx-wrap-multilines": "off",
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"require-await": "error"
},
Expand Down
2 changes: 0 additions & 2 deletions app/javascript/packages/components/alert.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

/** @typedef {import('react').ReactNode} ReactNode */

/**
Expand Down
2 changes: 0 additions & 2 deletions app/javascript/packages/components/icon.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

/**
* @typedef IconProps
*
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"private": true,
"version": "1.0.0",
"dependencies": {
"react": "^16.13.1"
"react": "^17.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useEffect } from 'react';
import { useContext, useEffect } from 'react';
import AcuantContext from '../context/acuant';
import useAsset from '../hooks/use-asset';
import useI18n from '../hooks/use-i18n';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {
import {
forwardRef,
useContext,
useRef,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

/** @typedef {import('react').MouseEvent} ReactMouseEvent */
/** @typedef {import('react').ReactNode} ReactNode */
/** @typedef {"button"|"reset"|"submit"} ButtonType */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import DeviceContext from '../context/device';
import useI18n from '../hooks/use-i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useMemo, useContext } from 'react';
import { useState, useMemo, useContext } from 'react';
import { Alert } from '@18f/identity-components';
import FormSteps from './form-steps';
import { UploadFormEntriesError } from '../services/upload';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import AcuantCapture from './acuant-capture';
import FormErrorMessage from './form-error-message';
import useI18n from '../hooks/use-i18n';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useState, useEffect } from 'react';
import { useContext, useState, useEffect } from 'react';
import useIfStillMounted from '../hooks/use-if-still-mounted';
import FileBase64CacheContext from '../context/file-base64-cache';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useState, useMemo, forwardRef } from 'react';
import { useContext, useState, useMemo, forwardRef } from 'react';
import FileImage from './file-image';
import DeviceContext from '../context/device';
import useInstanceId from '../hooks/use-instance-id';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { UploadFormEntryError } from '../services/upload';
import useI18n from '../hooks/use-i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef, useState } from 'react';
import { useEffect, useRef, useState } from 'react';
import { Alert } from '@18f/identity-components';
import Button from './button';
import PageHeading from './page-heading';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef, useEffect, useCallback } from 'react';
import { useRef, useEffect, useCallback } from 'react';
import { createFocusTrap } from 'focus-trap';
import useI18n from '../hooks/use-i18n';
import useAsset from '../hooks/use-asset';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import ServiceProviderContext from '../context/service-provider';
import useI18n from '../hooks/use-i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { forwardRef } from 'react';
import { forwardRef } from 'react';

/**
* @typedef PageHeadingProps
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { hasMediaAccess } from '@18f/identity-device';
import useI18n from '../hooks/use-i18n';
import DeviceContext from '../context/device';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {
import {
forwardRef,
useRef,
useState,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { hasMediaAccess } from '@18f/identity-device';
import useI18n from '../hooks/use-i18n';
import DeviceContext from '../context/device';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useContext, useRef } from 'react';
import { useState, useContext, useRef } from 'react';
import SubmissionInterstitial from './submission-interstitial';
import CallbackOnMount from './callback-on-mount';
import UploadContext from '../context/upload';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef, useEffect } from 'react';
import { useRef, useEffect } from 'react';
import useI18n from '../hooks/use-i18n';
import useAsset from '../hooks/use-asset';
import PageHeading from './page-heading';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import useAsync from '../hooks/use-async';
import UploadContext from '../context/upload';
import SubmissionComplete from './submission-complete';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import useAsync from '../hooks/use-async';
import UploadContext from '../context/upload';
import SubmissionComplete from './submission-complete';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, Suspense } from 'react';
import { Component, Suspense } from 'react';

/** @typedef {import('react').ReactNode} ReactNode */
/** @typedef {import('react').FunctionComponent} FunctionComponent */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { createContext, useMemo, useEffect, useState } from 'react';
import { createContext, useMemo, useEffect, useState } from 'react';

/** @typedef {import('react').ReactNode} ReactNode */

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { createContext, useMemo } from 'react';
import { createContext, useMemo } from 'react';
import defaultUpload from '../services/upload';

const UploadContext = createContext({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import UploadContext from '../context/upload';

/**
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packages/document-capture/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"version": "1.0.0",
"dependencies": {
"focus-trap": "^6.1.3",
"react": "^16.13.1"
"react": "^17.0.1"
}
}
1 change: 0 additions & 1 deletion app/javascript/packs/document-capture.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render } from 'react-dom';
import {
DocumentCapture,
Expand Down
7 changes: 6 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ module.exports = function (api) {

return {
presets: [
'@babel/preset-react',
[
'@babel/preset-react',
{
runtime: 'automatic',
},
],
isTestEnv && [
'@babel/preset-env',
{
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"intl-tel-input": "^16.0.7",
"libphonenumber-js": "^1.7.26",
"normalize.css": "^4.2.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"uswds": "^2.8.0",
"zxcvbn": "^4.4.2"
},
Expand All @@ -42,28 +42,28 @@
"@babel/register": "^7.12.1",
"@peculiar/webcrypto": "^1.1.3",
"@rails/webpacker": "^5.2.1",
"@testing-library/dom": "^7.21.8",
"@testing-library/react": "^10.4.8",
"@testing-library/react-hooks": "^3.4.1",
"@testing-library/user-event": "^12.0.11",
"@types/react": "^16.9.49",
"@testing-library/dom": "^7.28.0",
"@testing-library/react": "^11.2.1",
"@testing-library/react-hooks": "^3.4.2",
"@testing-library/user-event": "^12.2.2",
"@types/react": "^16.9.56",
"chai": "^3.5.0",
"dirty-chai": "^1.2.2",
"eslint": "^7.6.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.6",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"jsdom": "^16.2.2",
"mocha": "^8.1.3",
"postcss-clean": "^1.1.0",
"prettier": "^2.0.5",
"react-test-renderer": "^16.13.1",
"react-test-renderer": "^17.0.1",
"sinon": "^9.0.2",
"source-map-loader": "^1.1.0",
"typescript": "^4.0.3",
"typescript": "^4.1.2",
"webpack-dev-server": "^3.11.0"
}
}
1 change: 0 additions & 1 deletion spec/javascripts/packages/components/alert-spec.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Alert } from '@18f/identity-components';
import { render } from '../../support/document-capture';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Provider as AcuantContextProvider } from '@18f/identity-document-capture/context/acuant';
import AcuantCaptureCanvas from '@18f/identity-document-capture/components/acuant-capture-canvas';
import { render, useAcuant } from '../../../support/document-capture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import { fireEvent } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import userEvent from '@testing-library/user-event';
import Button from '@18f/identity-document-capture/components/button';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import { render } from '@testing-library/react';
import CallbackOnMount from '@18f/identity-document-capture/components/callback-on-mount';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { DeviceContext } from '@18f/identity-document-capture';
import DesktopDocumentDisclosure from '@18f/identity-document-capture/components/desktop-document-disclosure';
import { render } from '../../../support/document-capture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import userEvent from '@testing-library/user-event';
import { waitFor } from '@testing-library/dom';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import userEvent from '@testing-library/user-event';
import sinon from 'sinon';
import DeviceContext from '@18f/identity-document-capture/context/device';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import FileImage from '@18f/identity-document-capture/components/file-image';
import { render } from '../../../support/document-capture';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { createRef } from 'react';
import { createRef } from 'react';
import sinon from 'sinon';
import userEvent from '@testing-library/user-event';
import { fireEvent } from '@testing-library/react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import FormErrorMessage, {
RequiredValueMissingError,
} from '@18f/identity-document-capture/components/form-error-message';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import userEvent from '@testing-library/user-event';
import { waitFor } from '@testing-library/dom';
import sinon from 'sinon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import sinon from 'sinon';
import FullScreen from '@18f/identity-document-capture/components/full-screen';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { I18nContext, ServiceProviderContext } from '@18f/identity-document-capture';
import MobileIntroStep from '@18f/identity-document-capture/components/mobile-intro-step';
import { render } from '../../../support/document-capture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { createRef } from 'react';
import { createRef } from 'react';
import PageHeading from '@18f/identity-document-capture/components/page-heading';
import { render } from '../../../support/document-capture';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render } from '@testing-library/react';
import PromptOnNavigate from '@18f/identity-document-capture/components/prompt-on-navigate';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import userEvent from '@testing-library/user-event';
import sinon from 'sinon';
import { I18nContext, ServiceProviderContext } from '@18f/identity-document-capture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import userEvent from '@testing-library/user-event';
import { cleanup } from '@testing-library/react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import userEvent from '@testing-library/user-event';
import { waitFor } from '@testing-library/dom';
import sinon from 'sinon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import sinon from 'sinon';
import { waitFor } from '@testing-library/dom';
import useAsync from '@18f/identity-document-capture/hooks/use-async';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render } from '@testing-library/react';
import SubmissionInterstitial from '@18f/identity-document-capture/components/submission-interstitial';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { lazy, useState } from 'react';
import { lazy, useState } from 'react';
import sinon from 'sinon';
import { waitFor } from '@testing-library/dom';
import SuspenseErrorBoundary from '@18f/identity-document-capture/components/suspense-error-boundary';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { renderHook } from '@testing-library/react-hooks';
import AcuantContext, {
Provider as AcuantContextProvider,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { renderHook } from '@testing-library/react-hooks';
import UploadContext, {
Provider as UploadContextProvider,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react';
import { useEffect } from 'react';
import sinon from 'sinon';
import { UploadContextProvider } from '@18f/identity-document-capture';
import withBackgroundEncryptedUpload, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { renderHook } from '@testing-library/react-hooks';
import useAsset from '@18f/identity-document-capture/hooks/use-asset';
import AssetContext from '@18f/identity-document-capture/context/asset';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import { useState } from 'react';
import sinon from 'sinon';
import useAsync from '@18f/identity-document-capture/hooks/use-async';
import SuspenseErrorBoundary from '@18f/identity-document-capture/components/suspense-error-boundary';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { createRef } from 'react';
import { createRef } from 'react';
import sinon from 'sinon';
import useFocusFallbackRef from '@18f/identity-document-capture/hooks/use-focus-fallback-ref';
import { render } from '../../../support/document-capture';
Expand Down
Loading