Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(react-dialog): migrate to new package structure #25523

Merged
merged 7 commits into from
Nov 8, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: Migrate to new package structure.",
"packageName": "@fluentui/react-dialog",
"email": "[email protected]",
"dependentChangeType": "none"
}
5 changes: 3 additions & 2 deletions packages/react-components/react-dialog/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
bundle-size/
config/
coverage/
e2e/
docs/
etc/
node_modules/
src/
stories/
dist/types/
temp/
__fixtures__
Expand All @@ -16,7 +17,7 @@ __tests__
*.api.json
*.log
*.spec.*
*.stories.*
*.cy.*
*.test.*
*.yml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const rootMain = require('../../../../.storybook/main');

module.exports = /** @type {Omit<import('../../../../.storybook/main'), 'typescript'|'babel'>} */ ({
...rootMain,
stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'],
stories: [...rootMain.stories, '../stories/**/*.stories.mdx', '../stories/**/index.stories.@(ts|tsx)'],
addons: [...rootMain.addons],
webpackFinal: (config, options) => {
const localConfig = { ...rootMain.webpackFinal(config, options) };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"checkJs": true,
"types": ["static-assets", "environment", "storybook__addons"]
},
"include": ["../src/**/*.stories.ts", "../src/**/*.stories.tsx", "*.js"]
"include": ["../stories/**/*.stories.ts", "../stories/**/*.stories.tsx", "*.js"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
dialogTriggerCloseId,
dialogTriggerCloseSelector,
dialogTriggerOpenSelector,
} from './selectors';
} from '../../testing/selectors';

const mount = (element: JSX.Element) => mountBase(<FluentProvider theme={teamsLightTheme}>{element}</FluentProvider>);

Expand Down Expand Up @@ -179,6 +179,7 @@ describe('Dialog', () => {
}
}, [open]);
return (
//eslint-disable-next-line react/jsx-no-bind
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TristanWatanabe I don't expect this to be triggered for test files, can you please create an issue to disable this rule for tests?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<Dialog open={open} onOpenChange={(event, data) => setOpen(data.open)}>
<DialogTrigger disableButtonEnhancement>
<Button>Open dialog</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { render } from '@testing-library/react';
import { Dialog } from './Dialog';
import { DialogProps } from './Dialog.types';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';

describe('Dialog', () => {
isConformant<DialogProps>({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { render } from '@testing-library/react';
import { DialogActions } from './DialogActions';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';
import { DialogActionsProps } from './DialogActions.types';

describe('DialogActions', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { render } from '@testing-library/react';
import { DialogBody } from './DialogBody';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';
import type { DialogBodyProps } from './DialogBody.types';

describe('DialogBody', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { render } from '@testing-library/react';
import { DialogContent } from './DialogContent';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';

describe('DialogContent', () => {
isConformant({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import * as React from 'react';
import { render } from '@testing-library/react';
import { DialogSurface } from './DialogSurface';
import { resetIdsForTests } from '@fluentui/react-utilities';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';
import type { DialogSurfaceProps } from './DialogSurface.types';
import { mockUseDialogContext } from '../../contexts/dialogContext.mock';
import { mockUseDialogContext } from '../../testing/mockUseDialogContext';

jest.mock('../../contexts/dialogContext.ts');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
DialogTrigger,
} from '@fluentui/react-dialog';
import { Button } from '@fluentui/react-components';
import { dialogActionSelector, dialogTriggerOpenSelector } from './selectors';
import { dialogActionSelector, dialogTriggerOpenSelector } from '../../testing/selectors';

const mount = (element: JSX.Element) => mountBase(<FluentProvider theme={teamsLightTheme}>{element}</FluentProvider>);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { render } from '@testing-library/react';
import { DialogTitle } from './DialogTitle';
import { isConformant } from '../../common/isConformant';
import { isConformant } from '../../testing/isConformant';
import type { DialogTitleProps } from './DialogTitle.types';

describe('DialogTitle', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as React from 'react';
import { DialogTrigger } from './DialogTrigger';
import * as renderer from 'react-test-renderer';
import { createEvent, fireEvent, render } from '@testing-library/react';
import { isConformant } from '../../common/isConformant';
import { mockUseDialogContext } from '../../contexts/dialogContext.mock';
import { isConformant } from '../../testing/isConformant';
import { mockUseDialogContext } from '../../testing/mockUseDialogContext';
import { Enter } from '@fluentui/keyboard-keys';
import { DialogTriggerProps } from './DialogTrigger.types';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useDialogContext_unstable } from './dialogContext';
import type { DialogContextValue } from './dialogContext';
import { useDialogContext_unstable } from '../contexts/dialogContext';
import type { DialogContextValue } from '../contexts/dialogContext';

/**
* A test utility to mock the useDialogContext_unstable hook that relies on context selector
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"isolatedModules": false,
"types": ["node", "cypress", "cypress-storybook/cypress", "cypress-real-events"],
"lib": ["ES2019", "dom"]
},
"include": ["**/*.ts", "**/*.tsx"]
"include": ["**/*.cy.ts", "**/*.cy.tsx"]
}
2 changes: 1 addition & 1 deletion packages/react-components/react-dialog/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"path": "./.storybook/tsconfig.json"
},
{
"path": "./e2e/tsconfig.json"
"path": "./tsconfig.cy.json"
}
]
}
8 changes: 4 additions & 4 deletions packages/react-components/react-dialog/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"types": ["static-assets", "environment"]
},
"exclude": [
"./src/common/**",
"./src/testing/**",
"**/*.spec.ts",
"**/*.spec.tsx",
"**/*.mock.ts",
"**/*.mock.tsx",
"**/*.test.ts",
"**/*.test.tsx",
"**/*.stories.ts",
"**/*.stories.tsx"
"**/*.stories.tsx",
"**/*.cy.ts",
"**/*.cy.tsx"
],
"include": ["./src/**/*.ts", "./src/**/*.tsx"]
}
6 changes: 3 additions & 3 deletions packages/react-components/react-dialog/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
},
"include": [
"**/*.spec.ts",
"**/*.mock.ts",
"**/*.mock.tsx",
"**/*.spec.tsx",
"**/*.test.ts",
"**/*.test.tsx",
"**/*.d.ts"
"**/*.d.ts",
"./src/testing/**/*.ts",
"./src/testing/**/*.tsx"
]
}