From ebc5b2583c7f89517e8d38611a9bcf80c07e2788 Mon Sep 17 00:00:00 2001 From: Drew Walker Date: Thu, 2 Apr 2020 20:29:32 -0700 Subject: [PATCH] Fixing TS errors when running yarn and standardizing the way *.json imports are ignored --- .../breadcrumbs/src/useBreadcrumbs.ts | 1 + .../numberfield/src/useNumberField.ts | 1 + packages/@react-aria/overlays/src/useOverlay.ts | 1 + packages/@react-aria/searchfield/json.d.ts | 16 ---------------- .../searchfield/src/useSearchField.ts | 1 + .../searchfield/test/useSearchField.test.js | 1 + packages/@react-aria/tag/src/useTag.ts | 1 + packages/@react-aria/toast/src/useToast.ts | 1 + packages/@react-aria/toast/test/useToast.test.js | 1 + .../@react-spectrum/dialog/src/AlertDialog.tsx | 1 + packages/@react-spectrum/dialog/src/Dialog.tsx | 1 + packages/@react-spectrum/label/src/Label.tsx | 1 + tsconfig.json | 4 +++- 13 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 packages/@react-aria/searchfield/json.d.ts diff --git a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts b/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts index 16a9fa383dd..bda5c4dde76 100644 --- a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts +++ b/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts @@ -13,6 +13,7 @@ import {BreadcrumbsProps} from '@react-types/breadcrumbs'; import {DOMProps} from '@react-types/shared'; import {HTMLAttributes} from 'react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {useId} from '@react-aria/utils'; import {useMessageFormatter} from '@react-aria/i18n'; diff --git a/packages/@react-aria/numberfield/src/useNumberField.ts b/packages/@react-aria/numberfield/src/useNumberField.ts index 09f6382182b..7b80fbf3131 100644 --- a/packages/@react-aria/numberfield/src/useNumberField.ts +++ b/packages/@react-aria/numberfield/src/useNumberField.ts @@ -11,6 +11,7 @@ */ import {HTMLAttributes, useEffect} from 'react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {mergeProps, useId} from '@react-aria/utils'; import {NumberFieldState} from '@react-stately/numberfield'; diff --git a/packages/@react-aria/overlays/src/useOverlay.ts b/packages/@react-aria/overlays/src/useOverlay.ts index dcd4dff5e9b..77303478466 100644 --- a/packages/@react-aria/overlays/src/useOverlay.ts +++ b/packages/@react-aria/overlays/src/useOverlay.ts @@ -11,6 +11,7 @@ */ import {ButtonHTMLAttributes, HTMLAttributes, RefObject, useEffect} from 'react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {useInteractOutside} from '@react-aria/interactions'; import {useMessageFormatter} from '@react-aria/i18n'; diff --git a/packages/@react-aria/searchfield/json.d.ts b/packages/@react-aria/searchfield/json.d.ts deleted file mode 100644 index e37633f5816..00000000000 --- a/packages/@react-aria/searchfield/json.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -declare module '*.json' { - const value: any; - export default value; -} diff --git a/packages/@react-aria/searchfield/src/useSearchField.ts b/packages/@react-aria/searchfield/src/useSearchField.ts index 7ef62c0b10c..05c5c2a2627 100644 --- a/packages/@react-aria/searchfield/src/useSearchField.ts +++ b/packages/@react-aria/searchfield/src/useSearchField.ts @@ -12,6 +12,7 @@ import {ButtonHTMLAttributes, InputHTMLAttributes, RefObject} from 'react'; import {chain} from '@react-aria/utils'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {PressProps} from '@react-aria/interactions'; import {SearchFieldProps} from '@react-types/searchfield'; diff --git a/packages/@react-aria/searchfield/test/useSearchField.test.js b/packages/@react-aria/searchfield/test/useSearchField.test.js index 390f11ddd87..9c77e8ca68f 100644 --- a/packages/@react-aria/searchfield/test/useSearchField.test.js +++ b/packages/@react-aria/searchfield/test/useSearchField.test.js @@ -10,6 +10,7 @@ * governing permissions and limitations under the License. */ +// @ts-ignore import intlMessages from '../intl/*.json'; import {Provider} from '@react-spectrum/provider'; import React from 'react'; diff --git a/packages/@react-aria/tag/src/useTag.ts b/packages/@react-aria/tag/src/useTag.ts index 95e665eb89d..211101607fd 100644 --- a/packages/@react-aria/tag/src/useTag.ts +++ b/packages/@react-aria/tag/src/useTag.ts @@ -11,6 +11,7 @@ */ import {ButtonHTMLAttributes, HTMLAttributes, KeyboardEvent, ReactNode} from 'react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {mergeProps, useId} from '@react-aria/utils'; import {Removable} from '@react-types/shared'; diff --git a/packages/@react-aria/toast/src/useToast.ts b/packages/@react-aria/toast/src/useToast.ts index 4b4c3ee57f8..f0d2538e244 100644 --- a/packages/@react-aria/toast/src/useToast.ts +++ b/packages/@react-aria/toast/src/useToast.ts @@ -13,6 +13,7 @@ import {chain} from '@react-aria/utils'; import {DOMProps} from '@react-types/shared'; import {HTMLAttributes, ImgHTMLAttributes} from 'react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {PressProps} from '@react-aria/interactions'; import {ToastProps, ToastState} from '@react-types/toast'; diff --git a/packages/@react-aria/toast/test/useToast.test.js b/packages/@react-aria/toast/test/useToast.test.js index b913cf2471f..86b8c9ac6c1 100644 --- a/packages/@react-aria/toast/test/useToast.test.js +++ b/packages/@react-aria/toast/test/useToast.test.js @@ -11,6 +11,7 @@ */ import {cleanup} from '@testing-library/react'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {Provider} from '@react-spectrum/provider'; import React from 'react'; diff --git a/packages/@react-spectrum/dialog/src/AlertDialog.tsx b/packages/@react-spectrum/dialog/src/AlertDialog.tsx index d8ead44f0cd..a1f701c3d59 100644 --- a/packages/@react-spectrum/dialog/src/AlertDialog.tsx +++ b/packages/@react-spectrum/dialog/src/AlertDialog.tsx @@ -20,6 +20,7 @@ import {DialogContext, DialogContextValue} from './context'; import {Divider} from '@react-spectrum/divider'; import {Flex} from '@react-spectrum/layout'; import {Heading} from '@react-spectrum/typography'; +// @ts-ignore import intlMessages from '../intl/*.json'; import React, {useContext} from 'react'; import {SpectrumAlertDialogProps} from '@react-types/dialog'; diff --git a/packages/@react-spectrum/dialog/src/Dialog.tsx b/packages/@react-spectrum/dialog/src/Dialog.tsx index c6c5c7b8f49..be5576ac21f 100644 --- a/packages/@react-spectrum/dialog/src/Dialog.tsx +++ b/packages/@react-spectrum/dialog/src/Dialog.tsx @@ -17,6 +17,7 @@ import {DialogContext, DialogContextValue} from './context'; import {DOMRef} from '@react-types/shared'; import {FocusScope} from '@react-aria/focus'; import {Grid} from '@react-spectrum/layout'; +// @ts-ignore import intlMessages from '../intl/*.json'; import {mergeProps} from '@react-aria/utils'; import React, {useContext, useRef} from 'react'; diff --git a/packages/@react-spectrum/label/src/Label.tsx b/packages/@react-spectrum/label/src/Label.tsx index 4b4cabd5fef..518aa910ee8 100644 --- a/packages/@react-spectrum/label/src/Label.tsx +++ b/packages/@react-spectrum/label/src/Label.tsx @@ -13,6 +13,7 @@ import Asterisk from '@spectrum-icons/ui/Asterisk'; import {classNames, filterDOMProps, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils'; import {DOMRef} from '@react-types/shared'; +// @ts-ignore import intlMessages from '../intl/*.json'; import React from 'react'; import {SpectrumLabelProps} from '@react-types/label'; diff --git a/tsconfig.json b/tsconfig.json index 13a68f24a0e..e4e60d003d3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,7 +25,9 @@ "lib": [ "es6", "dom" - ] + ], + // Skip type checking of all declaration files (*.d.ts). + "skipLibCheck": true }, "include": [ "packages"