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
10 changes: 8 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@
{
"devDependencies": ["**/__tests__/*", "rollup.config.mjs"]
}
]
],
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off"
},
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"parserOptions": {
"project": ["tsconfig.json"]
},
"extends": ["./packages/eslint-config-react/typescript.js"]
"extends": ["./packages/eslint-config-react/typescript.js"],
"rules": {
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off"
}
}
]
}
7 changes: 6 additions & 1 deletion babel.config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react",
[
"@babel/preset-react",
{
"runtime": "automatic"
}
],
["@babel/preset-typescript", { "allowDeclareFields": true }]
],
"plugins": ["@babel/plugin-transform-runtime"]
Expand Down
1 change: 0 additions & 1 deletion packages/jest-helpers/src/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react'
import makeHelpers from '..'
import { RenderWithThemeFn } from '../helpers/renderWithTheme'
import { ShouldMatchEmotionSnapshotFn } from '../helpers/shouldMatchEmotionSnapshot'
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-helpers/src/helpers/renderWithTheme.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import createCache from '@emotion/cache'
import { CacheProvider } from '@emotion/react'
import { RenderOptions, render } from '@testing-library/react'
import React, { FC, ReactNode } from 'react'
import { FC, ReactNode } from 'react'

const emotionCache = createCache({
key: 'cache',
Expand Down
2 changes: 1 addition & 1 deletion packages/use-dataloader/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ module.exports = {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, '../../')] }
]
],
}
};
2 changes: 1 addition & 1 deletion packages/use-dataloader/src/DataLoaderProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types'
import React, {
import {
ReactElement,
ReactNode,
createContext,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from '@testing-library/react'
import { act, renderHook } from '@testing-library/react-hooks'
import React, { ReactNode } from 'react'
import { ReactNode } from 'react'
import DataLoaderProvider, { useDataLoaderContext } from '../DataLoaderProvider'
import { KEY_IS_NOT_STRING_ERROR, StatusEnum } from '../constants'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { act, renderHook } from '@testing-library/react-hooks'
import React from 'react'
import DataLoaderProvider, { useDataLoaderContext } from '../DataLoaderProvider'
import { KEY_IS_NOT_STRING_ERROR } from '../constants'
import { PromiseType, UseDataLoaderConfig, UseDataLoaderResult } from '../types'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { act } from '@testing-library/react'
import { renderHook } from '@testing-library/react-hooks'
import React from 'react'
import DataLoaderProvider from '../DataLoaderProvider'
import { KEY_IS_NOT_STRING_ERROR } from '../constants'
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/use-i18n/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ module.exports = {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, '../../')] }
]
],
}
};
1 change: 0 additions & 1 deletion packages/use-i18n/src/__tests__/usei18n.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { act, renderHook } from '@testing-library/react-hooks'
import mockdate from 'mockdate'
import React from 'react'
import I18n, { useI18n, useTranslation } from '..'
import en from './locales/en.json'
import es from './locales/es.json'
Expand Down
2 changes: 1 addition & 1 deletion packages/use-i18n/src/usei18n.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
formatDistanceToNowStrict,
} from 'date-fns'
import PropTypes from 'prop-types'
import React, {
import {
ReactElement,
ReactNode,
createContext,
Expand Down
2 changes: 1 addition & 1 deletion packages/use-query-params/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ module.exports = {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, '../../')] }
]
],
}
};
2 changes: 1 addition & 1 deletion packages/use-query-params/src/__tests__/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { act, renderHook } from '@testing-library/react-hooks'
import { History, createMemoryHistory } from 'history'
import React, { ReactNode, useLayoutEffect, useState } from 'react'
import { ReactNode, useLayoutEffect, useState } from 'react'
import { MemoryRouter, Router } from 'react-router-dom'
import useQueryParams from '..'

Expand Down
2 changes: 1 addition & 1 deletion packages/use-segment/src/__tests__/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AnalyticsBrowser, Context } from '@segment/analytics-next'
import { renderHook } from '@testing-library/react-hooks'
import React, { ReactNode } from 'react'
import { ReactNode } from 'react'
import waitForExpect from 'wait-for-expect'
import SegmentProvider, { useSegment } from '..'
import type { Analytics, OnEventError, SegmentProviderProps } from '..'
Expand Down
2 changes: 1 addition & 1 deletion packages/use-segment/src/useSegment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
AnalyticsSettings,
InitOptions,
} from '@segment/analytics-next'
import React, {
import {
ReactNode,
createContext,
useContext,
Expand Down
7 changes: 6 additions & 1 deletion rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,16 @@ const getConfig = (pkg, isBrowser = false) => {
extensions: ['.js', '.jsx', '.ts', '.tsx', '.es', '.mjs'],
plugins: [
'@babel/plugin-transform-runtime',
'@babel/plugin-transform-react-jsx',
],
presets: [
['@babel/env', { modules: false, targets }],
'@babel/preset-typescript',
[
'@babel/preset-react',
{
runtime: 'automatic',
},
],
],
}),
nodeResolve({
Expand Down