diff --git a/packages/react-pdf/.eslintrc.json b/packages/react-pdf/.eslintrc.json index 6f2c8ec39..1c5b645ce 100644 --- a/packages/react-pdf/.eslintrc.json +++ b/packages/react-pdf/.eslintrc.json @@ -1,3 +1,3 @@ { - "extends": "wojtekmaj/react-no-automatic-runtime" + "extends": "wojtekmaj/react" } diff --git a/packages/react-pdf/src/Document.spec.tsx b/packages/react-pdf/src/Document.spec.tsx index b749fabf4..4b397de6c 100644 --- a/packages/react-pdf/src/Document.spec.tsx +++ b/packages/react-pdf/src/Document.spec.tsx @@ -1,5 +1,5 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React, { createRef } from 'react'; +import { createRef } from 'react'; import { fireEvent, getByTestId, render } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/Document.tsx b/packages/react-pdf/src/Document.tsx index 0116d681c..6cd7e22ba 100644 --- a/packages/react-pdf/src/Document.tsx +++ b/packages/react-pdf/src/Document.tsx @@ -1,13 +1,6 @@ 'use client'; -import React, { - forwardRef, - useCallback, - useEffect, - useImperativeHandle, - useMemo, - useRef, -} from 'react'; +import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react'; import PropTypes from 'prop-types'; import makeEventProps from 'make-event-props'; import makeCancellable from 'make-cancellable-promise'; diff --git a/packages/react-pdf/src/Message.tsx b/packages/react-pdf/src/Message.tsx index 6d4b246a7..8f735d53f 100644 --- a/packages/react-pdf/src/Message.tsx +++ b/packages/react-pdf/src/Message.tsx @@ -1,5 +1,3 @@ -import React from 'react'; - type MessageProps = { children?: React.ReactNode; type: 'error' | 'loading' | 'no-data'; diff --git a/packages/react-pdf/src/Outline.spec.tsx b/packages/react-pdf/src/Outline.spec.tsx index 74ad1fcbb..d5e6c7444 100644 --- a/packages/react-pdf/src/Outline.spec.tsx +++ b/packages/react-pdf/src/Outline.spec.tsx @@ -1,5 +1,5 @@ import { beforeAll, describe, expect, it } from 'vitest'; -import React, { createRef } from 'react'; +import { createRef } from 'react'; import { render, screen } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/Outline.tsx b/packages/react-pdf/src/Outline.tsx index 0f8bb09e1..47be1a466 100644 --- a/packages/react-pdf/src/Outline.tsx +++ b/packages/react-pdf/src/Outline.tsx @@ -1,6 +1,6 @@ 'use client'; -import React, { useEffect, useMemo } from 'react'; +import { useEffect, useMemo } from 'react'; import PropTypes from 'prop-types'; import makeCancellable from 'make-cancellable-promise'; import makeEventProps from 'make-event-props'; diff --git a/packages/react-pdf/src/OutlineItem.spec.tsx b/packages/react-pdf/src/OutlineItem.spec.tsx index 9bdf8aade..b94f79def 100644 --- a/packages/react-pdf/src/OutlineItem.spec.tsx +++ b/packages/react-pdf/src/OutlineItem.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React from 'react'; import { fireEvent, getAllByRole, render, screen } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/OutlineItem.tsx b/packages/react-pdf/src/OutlineItem.tsx index 2ee90d2be..46624943e 100644 --- a/packages/react-pdf/src/OutlineItem.tsx +++ b/packages/react-pdf/src/OutlineItem.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import invariant from 'tiny-invariant'; import Ref from './Ref.js'; diff --git a/packages/react-pdf/src/Page.spec.tsx b/packages/react-pdf/src/Page.spec.tsx index a5605f329..c1fed93a0 100644 --- a/packages/react-pdf/src/Page.spec.tsx +++ b/packages/react-pdf/src/Page.spec.tsx @@ -1,5 +1,5 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React, { createRef } from 'react'; +import { createRef } from 'react'; import { fireEvent, render } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/Page.tsx b/packages/react-pdf/src/Page.tsx index a2b10ca78..fb221ae62 100644 --- a/packages/react-pdf/src/Page.tsx +++ b/packages/react-pdf/src/Page.tsx @@ -1,6 +1,6 @@ 'use client'; -import React, { useEffect, useMemo, useRef } from 'react'; +import { useEffect, useMemo, useRef } from 'react'; import PropTypes from 'prop-types'; import makeCancellable from 'make-cancellable-promise'; import makeEventProps from 'make-event-props'; diff --git a/packages/react-pdf/src/Page/AnnotationLayer.spec.tsx b/packages/react-pdf/src/Page/AnnotationLayer.spec.tsx index 4e253e4a4..97271c718 100644 --- a/packages/react-pdf/src/Page/AnnotationLayer.spec.tsx +++ b/packages/react-pdf/src/Page/AnnotationLayer.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it } from 'vitest'; -import React from 'react'; import { render } from '@testing-library/react'; import { pdfjs } from '../index.test.js'; diff --git a/packages/react-pdf/src/Page/AnnotationLayer.tsx b/packages/react-pdf/src/Page/AnnotationLayer.tsx index 8b3187bbe..3e407d4b5 100644 --- a/packages/react-pdf/src/Page/AnnotationLayer.tsx +++ b/packages/react-pdf/src/Page/AnnotationLayer.tsx @@ -1,6 +1,6 @@ 'use client'; -import React, { useEffect, useMemo, useRef } from 'react'; +import { useEffect, useMemo, useRef } from 'react'; import makeCancellable from 'make-cancellable-promise'; import clsx from 'clsx'; import invariant from 'tiny-invariant'; diff --git a/packages/react-pdf/src/Page/PageCanvas.spec.tsx b/packages/react-pdf/src/Page/PageCanvas.spec.tsx index e94bb3975..a1e010129 100644 --- a/packages/react-pdf/src/Page/PageCanvas.spec.tsx +++ b/packages/react-pdf/src/Page/PageCanvas.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React from 'react'; import { render } from '@testing-library/react'; import { pdfjs } from '../index.test.js'; diff --git a/packages/react-pdf/src/Page/PageCanvas.tsx b/packages/react-pdf/src/Page/PageCanvas.tsx index 3304a834f..c67616ba3 100644 --- a/packages/react-pdf/src/Page/PageCanvas.tsx +++ b/packages/react-pdf/src/Page/PageCanvas.tsx @@ -1,6 +1,6 @@ 'use client'; -import React, { useCallback, useEffect, useMemo, useRef } from 'react'; +import { useCallback, useEffect, useMemo, useRef } from 'react'; import mergeRefs from 'merge-refs'; import invariant from 'tiny-invariant'; import warning from 'warning'; diff --git a/packages/react-pdf/src/Page/PageSVG.spec.tsx b/packages/react-pdf/src/Page/PageSVG.spec.tsx index 0753d1eea..3c5bb289d 100644 --- a/packages/react-pdf/src/Page/PageSVG.spec.tsx +++ b/packages/react-pdf/src/Page/PageSVG.spec.tsx @@ -1,6 +1,5 @@ import { Blob } from 'node:buffer'; import { beforeAll, describe, expect, it } from 'vitest'; -import React from 'react'; import { render } from '@testing-library/react'; import { pdfjs } from '../index.test.js'; diff --git a/packages/react-pdf/src/Page/PageSVG.tsx b/packages/react-pdf/src/Page/PageSVG.tsx index 8d58eda8c..2ea79f830 100644 --- a/packages/react-pdf/src/Page/PageSVG.tsx +++ b/packages/react-pdf/src/Page/PageSVG.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useMemo } from 'react'; +import { useEffect, useMemo } from 'react'; import makeCancellable from 'make-cancellable-promise'; import invariant from 'tiny-invariant'; import warning from 'warning'; diff --git a/packages/react-pdf/src/Page/TextLayer.spec.tsx b/packages/react-pdf/src/Page/TextLayer.spec.tsx index 28c390ad1..2f0980a0c 100644 --- a/packages/react-pdf/src/Page/TextLayer.spec.tsx +++ b/packages/react-pdf/src/Page/TextLayer.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React from 'react'; import { render } from '@testing-library/react'; import { pdfjs } from '../index.test.js'; diff --git a/packages/react-pdf/src/Page/TextLayer.tsx b/packages/react-pdf/src/Page/TextLayer.tsx index 8bffa350d..d05ba7cf0 100644 --- a/packages/react-pdf/src/Page/TextLayer.tsx +++ b/packages/react-pdf/src/Page/TextLayer.tsx @@ -1,6 +1,6 @@ 'use client'; -import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react'; +import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react'; import makeCancellable from 'make-cancellable-promise'; import clsx from 'clsx'; import invariant from 'tiny-invariant'; diff --git a/packages/react-pdf/src/StructTree.spec.tsx b/packages/react-pdf/src/StructTree.spec.tsx index 7712c7e13..3d26ad41d 100644 --- a/packages/react-pdf/src/StructTree.spec.tsx +++ b/packages/react-pdf/src/StructTree.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it } from 'vitest'; -import React from 'react'; import { render } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/StructTree.tsx b/packages/react-pdf/src/StructTree.tsx index 346c8fbdf..4b845b6c2 100644 --- a/packages/react-pdf/src/StructTree.tsx +++ b/packages/react-pdf/src/StructTree.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import { useEffect } from 'react'; import makeCancellable from 'make-cancellable-promise'; import invariant from 'tiny-invariant'; import warning from 'warning'; diff --git a/packages/react-pdf/src/StructTreeItem.tsx b/packages/react-pdf/src/StructTreeItem.tsx index 280f91e8a..e1ef9d1df 100644 --- a/packages/react-pdf/src/StructTreeItem.tsx +++ b/packages/react-pdf/src/StructTreeItem.tsx @@ -1,4 +1,4 @@ -import React, { useMemo } from 'react'; +import { useMemo } from 'react'; import { getAttributes, diff --git a/packages/react-pdf/src/Thumbnail.spec.tsx b/packages/react-pdf/src/Thumbnail.spec.tsx index f28b2e46b..593aa2e4e 100644 --- a/packages/react-pdf/src/Thumbnail.spec.tsx +++ b/packages/react-pdf/src/Thumbnail.spec.tsx @@ -1,5 +1,4 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; -import React, { createRef } from 'react'; import { fireEvent, render } from '@testing-library/react'; import { pdfjs } from './index.test.js'; diff --git a/packages/react-pdf/src/Thumbnail.tsx b/packages/react-pdf/src/Thumbnail.tsx index 823bb4113..3e7918776 100644 --- a/packages/react-pdf/src/Thumbnail.tsx +++ b/packages/react-pdf/src/Thumbnail.tsx @@ -1,6 +1,5 @@ 'use client'; -import React from 'react'; import clsx from 'clsx'; import invariant from 'tiny-invariant'; diff --git a/packages/react-pdf/tsconfig.json b/packages/react-pdf/tsconfig.json index ad3b0afdd..5ecdcca2d 100644 --- a/packages/react-pdf/tsconfig.json +++ b/packages/react-pdf/tsconfig.json @@ -3,7 +3,7 @@ "declaration": true, "esModuleInterop": true, "isolatedModules": true, - "jsx": "react", + "jsx": "react-jsx", "module": "nodenext", "noEmit": true, "noUncheckedIndexedAccess": true, diff --git a/test/Test.tsx b/test/Test.tsx index dd8d38c04..fe166bc94 100644 --- a/test/Test.tsx +++ b/test/Test.tsx @@ -296,8 +296,8 @@ export default function Test() { displayAll ? ( Array.from(new Array(numPages), (el, index) => ( ref && ref.scrollIntoView() : null } diff --git a/test/shared/utils.ts b/test/shared/utils.ts index 6265a20bc..635884278 100644 --- a/test/shared/utils.ts +++ b/test/shared/utils.ts @@ -40,7 +40,7 @@ export function isBlob(variable: unknown): variable is Blob { * @param {*} variable String to check */ export function isDataURI(variable: unknown): variable is `data:${string}` { - return isString(variable) && /^data:/.test(variable); + return isString(variable) && variable.startsWith('data:'); } export function dataURItoByteString(dataURI: unknown): string {