Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into refactor/slider-c…
Browse files Browse the repository at this point in the history
…omposite
  • Loading branch information
mj12albert committed Oct 13, 2024
2 parents 97dc5b8 + 9e4c5e6 commit cbe23cd
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 117 deletions.
8 changes: 4 additions & 4 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ samsung 22
# snapshot of `npx browserslist "maintained node versions"`
# On update check all #stable-snapshot markers
[node]
node 18.0
node 14.0

# same as `node`
[coverage]
node 18.0
node 14.0

# same as `node`
[development]
node 18.0
node 14.0

# same as `node`
[test]
node 18.0
node 14.0
2 changes: 1 addition & 1 deletion packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"devDependencies": {
"@types/eslint": "^8.56.12",
"@typescript-eslint/experimental-utils": "^5.62.0",
"@typescript-eslint/parser": "^7.8.0"
"@typescript-eslint/parser": "^8.8.1"
},
"scripts": {
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/eslint-plugin-material-ui/**/*.test.js' --timeout 3000"
Expand Down
16 changes: 8 additions & 8 deletions packages/mui-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
"typescript": "tsc -b tsconfig.json"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.25.7",
"@floating-ui/react": "^0.26.24",
"@floating-ui/react-dom": "^2.1.2",
"@floating-ui/utils": "^0.2.8",
"@mui/types": "^7.2.17",
"@mui/utils": "^6.1.1",
"@mui/types": "^7.2.18",
"@mui/utils": "^6.1.3",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
"use-sync-external-store": "^1.2.2"
},
"devDependencies": {
"@mui/internal-test-utils": "1.0.14",
"@testing-library/react": "^15.0.7",
"@mui/internal-test-utils": "1.0.16",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/chai": "^4.3.20",
"@types/chai-dom": "^1.11.3",
Expand All @@ -67,8 +67,8 @@
"lodash": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sinon": "^17.0.1",
"typescript": "^5.4.5"
"sinon": "^19.0.2",
"typescript": "^5.6.3"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
Expand All @@ -86,6 +86,6 @@
"directory": "build"
},
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
}
}
8 changes: 6 additions & 2 deletions packages/mui-base/test/createRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@ import {

type BaseUITestRenderer = Omit<Renderer, 'render'> & {
render: (
element: React.ReactElement<unknown>,
element: React.ReactElement<DataAttributes>,
options?: RenderOptions,
) => Promise<MuiRenderResult>;
};

interface DataAttributes {
[key: `data-${string}`]: string;
}

export function createRenderer(globalOptions?: CreateRendererOptions): BaseUITestRenderer {
const createRendererResult = sharedCreateRenderer(globalOptions);
const { render: originalRender } = createRendererResult;

const render = async (element: React.ReactElement<unknown>, options?: RenderOptions) =>
const render = async (element: React.ReactElement<DataAttributes>, options?: RenderOptions) =>
act(async () => {
const result = await originalRender(element, options);
await flushMicrotasks();
Expand Down
Loading

0 comments on commit cbe23cd

Please sign in to comment.