diff --git a/change/@fluentui-react-dialog-e2643f9f-5c8b-400a-b856-3e1ee63e0b19.json b/change/@fluentui-react-dialog-e2643f9f-5c8b-400a-b856-3e1ee63e0b19.json new file mode 100644 index 00000000000000..3a986327c487ee --- /dev/null +++ b/change/@fluentui-react-dialog-e2643f9f-5c8b-400a-b856-3e1ee63e0b19.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: migrates to JSX importSource", + "packageName": "@fluentui/react-dialog", + "email": "bernardo.sunderhus@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-dialog/.swcrc b/packages/react-components/react-dialog/.swcrc index b4ffa86dee3067..8cb6e4d2895dfe 100644 --- a/packages/react-components/react-dialog/.swcrc +++ b/packages/react-components/react-dialog/.swcrc @@ -19,7 +19,8 @@ "externalHelpers": true, "transform": { "react": { - "runtime": "classic", + "runtime": "automatic", + "importSource": "@fluentui/react-jsx-runtime", "useSpread": true } }, diff --git a/packages/react-components/react-dialog/jest.config.js b/packages/react-components/react-dialog/jest.config.js index c7fbec8af6bdf5..44ff5b7cc6f3c0 100644 --- a/packages/react-components/react-dialog/jest.config.js +++ b/packages/react-components/react-dialog/jest.config.js @@ -10,7 +10,11 @@ module.exports = { '^.+\\.tsx?$': [ 'ts-jest', { - tsconfig: '/tsconfig.spec.json', + tsconfig: { + module: 'CommonJS', + jsx: 'react-jsx', + jsxImportSource: '@fluentui/react-jsx-runtime', + }, isolatedModules: true, }, ], diff --git a/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx b/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx index 0bedc2e47b1846..dddd447f28f34d 100644 --- a/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx +++ b/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx @@ -1,3 +1,6 @@ +/// +/// + import * as React from 'react'; import { mount as mountBase } from '@cypress/react'; diff --git a/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx b/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx index 2247dd3e6d3736..50fe3a5cf8aabd 100644 --- a/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx +++ b/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { Dialog } from './Dialog'; import { DialogProps } from './Dialog.types'; diff --git a/packages/react-components/react-dialog/src/components/Dialog/renderDialog.tsx b/packages/react-components/react-dialog/src/components/Dialog/renderDialog.tsx index 320a9b1d2231ab..bad5ec35b8d620 100644 --- a/packages/react-components/react-dialog/src/components/Dialog/renderDialog.tsx +++ b/packages/react-components/react-dialog/src/components/Dialog/renderDialog.tsx @@ -1,8 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsx createElement */ - -import { createElement } from '@fluentui/react-jsx-runtime'; - import { DialogProvider, DialogSurfaceProvider } from '../../contexts'; import type { DialogState, DialogContextValues } from './Dialog.types'; diff --git a/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx b/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx index d9ea91db679c29..6c604d6711c41f 100644 --- a/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx +++ b/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { DialogActions } from './DialogActions'; import { isConformant } from '../../testing/isConformant'; diff --git a/packages/react-components/react-dialog/src/components/DialogActions/renderDialogActions.tsx b/packages/react-components/react-dialog/src/components/DialogActions/renderDialogActions.tsx index a489cf2c7811de..9bff20a60d83de 100644 --- a/packages/react-components/react-dialog/src/components/DialogActions/renderDialogActions.tsx +++ b/packages/react-components/react-dialog/src/components/DialogActions/renderDialogActions.tsx @@ -1,8 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsx createElement */ - -import { createElement } from '@fluentui/react-jsx-runtime'; - import { assertSlots } from '@fluentui/react-utilities'; import type { DialogActionsState, DialogActionsSlots } from './DialogActions.types'; diff --git a/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx b/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx index c0315df4b4e6d0..248e066edfc8a0 100644 --- a/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx +++ b/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { DialogBody } from './DialogBody'; import { isConformant } from '../../testing/isConformant'; diff --git a/packages/react-components/react-dialog/src/components/DialogBody/renderDialogBody.tsx b/packages/react-components/react-dialog/src/components/DialogBody/renderDialogBody.tsx index 93ccdbfd464ce5..8d08ed5bdce579 100644 --- a/packages/react-components/react-dialog/src/components/DialogBody/renderDialogBody.tsx +++ b/packages/react-components/react-dialog/src/components/DialogBody/renderDialogBody.tsx @@ -1,8 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsx createElement */ - -import { createElement } from '@fluentui/react-jsx-runtime'; - import { assertSlots } from '@fluentui/react-utilities'; import type { DialogBodyState, DialogBodySlots } from './DialogBody.types'; diff --git a/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx b/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx index bb6f46eb478ab5..5d02eb2cf67b2b 100644 --- a/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx +++ b/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { DialogContent } from './DialogContent'; import { isConformant } from '../../testing/isConformant'; diff --git a/packages/react-components/react-dialog/src/components/DialogContent/renderDialogContent.tsx b/packages/react-components/react-dialog/src/components/DialogContent/renderDialogContent.tsx index a8b23899a771af..20551353c6d6e4 100644 --- a/packages/react-components/react-dialog/src/components/DialogContent/renderDialogContent.tsx +++ b/packages/react-components/react-dialog/src/components/DialogContent/renderDialogContent.tsx @@ -1,8 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsx createElement */ - -import { createElement } from '@fluentui/react-jsx-runtime'; - import { assertSlots } from '@fluentui/react-utilities'; import type { DialogContentState, DialogContentSlots } from './DialogContent.types'; diff --git a/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx b/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx index ed5e71e72e5ace..0ef9ddf023867e 100644 --- a/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx +++ b/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { DialogSurface } from './DialogSurface'; import { resetIdsForTests } from '@fluentui/react-utilities'; diff --git a/packages/react-components/react-dialog/src/components/DialogSurface/renderDialogSurface.tsx b/packages/react-components/react-dialog/src/components/DialogSurface/renderDialogSurface.tsx index c217a9c15ea5ea..f2274040d502d5 100644 --- a/packages/react-components/react-dialog/src/components/DialogSurface/renderDialogSurface.tsx +++ b/packages/react-components/react-dialog/src/components/DialogSurface/renderDialogSurface.tsx @@ -1,8 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsx createElement */ - -import { createElement } from '@fluentui/react-jsx-runtime'; - import { assertSlots } from '@fluentui/react-utilities'; import type { DialogSurfaceState, DialogSurfaceSlots, DialogSurfaceContextValues } from './DialogSurface.types'; import { DialogSurfaceProvider } from '../../contexts'; diff --git a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx index c5db62f134a3bf..b7cf91b41509b1 100644 --- a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx +++ b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx @@ -1,3 +1,6 @@ +/// +/// + import * as React from 'react'; import { mount as mountBase } from '@cypress/react'; diff --git a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx index 96eed0d3c92fb6..5a719262e9c633 100644 --- a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx +++ b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { render } from '@testing-library/react'; import { DialogTitle } from './DialogTitle'; import { isConformant } from '../../testing/isConformant'; diff --git a/packages/react-components/react-dialog/src/components/DialogTitle/renderDialogTitle.tsx b/packages/react-components/react-dialog/src/components/DialogTitle/renderDialogTitle.tsx index b10e3822fffdd9..8cc28efd2c64b7 100644 --- a/packages/react-components/react-dialog/src/components/DialogTitle/renderDialogTitle.tsx +++ b/packages/react-components/react-dialog/src/components/DialogTitle/renderDialogTitle.tsx @@ -1,9 +1,3 @@ -/** @jsxRuntime classic */ -/** @jsxFrag Fragment */ -/** @jsx createElement */ - -import { createElement, Fragment } from '@fluentui/react-jsx-runtime'; - import { assertSlots } from '@fluentui/react-utilities'; import type { DialogTitleState, DialogTitleSlots } from './DialogTitle.types'; diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx index acd15f5ad3e12e..e5a1ed17b6944a 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx index e36839a8ddfdfb..9fd2c37face443 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogFluidDialogActions.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogFluidDialogActions.stories.tsx index de95f61c2a9210..34e9ac501ecb0b 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogFluidDialogActions.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogFluidDialogActions.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx index 46bead47250046..7d059a0886cb37 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx index af7c7750072729..e373a0227895d3 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx index 4cd63e09f95db4..5ed1ad702a0a3d 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx index b85acb48fa9335..cddad8f5a230e4 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx index 4bec7eb96b1f97..49c9a41dd8e0b2 100644 --- a/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx +++ b/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import { Dialog, DialogTrigger, diff --git a/packages/react-components/react-dialog/tsconfig.json b/packages/react-components/react-dialog/tsconfig.json index 1317f81620ca5e..6a3ed49fce2709 100644 --- a/packages/react-components/react-dialog/tsconfig.json +++ b/packages/react-components/react-dialog/tsconfig.json @@ -5,7 +5,7 @@ "noEmit": true, "isolatedModules": true, "importHelpers": true, - "jsx": "react", + "jsx": "preserve", "noUnusedLocals": true, "preserveConstEnums": true },