Skip to content

Commit e6d1977

Browse files
authored
Merge branch 'main' into externaldimensions
2 parents 772dafc + 1201a4f commit e6d1977

17 files changed

Lines changed: 35 additions & 55 deletions

.github/workflows/ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ jobs:
4444
- name: Visual regression test
4545
run: node --run visual
4646

47+
- name: Upload test failure artifacts
48+
if: failure()
49+
uses: actions/upload-artifact@v7
50+
with:
51+
name: test-artifacts
52+
path: |
53+
test/browser/**/__screenshots__/**
54+
test/browser/**/__traces__/**
55+
.vitest-attachments/test/**/*
56+
if-no-files-found: ignore
57+
4758
- name: Upload coverage
4859
uses: codecov/codecov-action@v5
4960
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.cache
2+
/.claude
23
/coverage
34
/dist
45
/lib

eslint.config.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { defineConfig, globalIgnores } from 'eslint/config';
1313
import tseslint from 'typescript-eslint';
1414

1515
export default defineConfig([
16-
globalIgnores(['.cache', '.nitro', '.output', '.tanstack', 'coverage', 'dist', 'lib']),
16+
globalIgnores(['.cache', '.claude', '.nitro', '.output', '.tanstack', 'coverage', 'dist', 'lib']),
1717

1818
{
1919
linterOptions: {
@@ -314,17 +314,15 @@ copy(
314314
.join('\n')
315315
);
316316
*/
317-
'@eslint-react/component-hook-factories': 1,
318-
'@eslint-react/error-boundaries': 1,
319-
'@eslint-react/exhaustive-deps': 1,
320317
'@eslint-react/jsx-dollar': 1,
321318
'@eslint-react/jsx-key-before-spread': 1,
322319
'@eslint-react/jsx-no-comment-textnodes': 1,
323-
'@eslint-react/jsx-no-duplicate-props': 1,
324320
'@eslint-react/jsx-shorthand-boolean': 1,
325321
'@eslint-react/jsx-shorthand-fragment': 1,
326-
'@eslint-react/jsx-uses-react': 1,
327-
'@eslint-react/jsx-uses-vars': 1,
322+
'@eslint-react/component-hook-factories': 1,
323+
'@eslint-react/error-boundaries': 1,
324+
'@eslint-react/exhaustive-deps': 1,
325+
'@eslint-react/immutability': 0,
328326
'@eslint-react/no-access-state-in-setstate': 1,
329327
'@eslint-react/no-array-index-key': 0,
330328
'@eslint-react/no-children-count': 1,
@@ -343,7 +341,9 @@ copy(
343341
'@eslint-react/no-direct-mutation-state': 1,
344342
'@eslint-react/no-duplicate-key': 1,
345343
'@eslint-react/no-forward-ref': 1,
344+
'@eslint-react/no-implicit-children': 0,
346345
'@eslint-react/no-implicit-key': 1,
346+
'@eslint-react/no-implicit-ref': 0,
347347
'@eslint-react/no-leaked-conditional-rendering': 1,
348348
'@eslint-react/no-missing-component-display-name': 1,
349349
'@eslint-react/no-missing-context-display-name': 1,

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"typecheck": "tsc --build"
4848
},
4949
"devDependencies": {
50-
"@eslint-react/eslint-plugin": "3.0.0-next.71",
50+
"@eslint-react/eslint-plugin": "3.0.0-rc.0",
5151
"@eslint/markdown": "^7.5.1",
5252
"@faker-js/faker": "^10.0.0",
5353
"@tanstack/react-router": "^1.132.31",
@@ -68,14 +68,14 @@
6868
"eslint-plugin-testing-library": "^7.13.5",
6969
"jspdf": "^4.0.0",
7070
"jspdf-autotable": "^5.0.2",
71-
"oxfmt": "0.36.0",
71+
"oxfmt": "0.38.0",
7272
"playwright": "~1.58.0",
7373
"postcss": "^8.5.2",
7474
"react": "^19.2.1",
7575
"react-dom": "^19.2.1",
7676
"rolldown": "1.0.0-rc.5",
7777
"rolldown-plugin-dts": "^0.22.1",
78-
"typescript": "~5.9.2",
78+
"typescript": "~6.0.1-rc",
7979
"typescript-eslint": "^8.56.0",
8080
"vite": "^8.0.0-beta.16",
8181
"vitest": "^4.0.17",
@@ -86,6 +86,7 @@
8686
"react-dom": "^19.2"
8787
},
8888
"overrides": {
89+
"typescript": "$typescript",
8990
"vite": "$vite"
9091
}
9192
}

rolldown.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default defineConfig({
2222
classPrefix: `rdg-${pkg.version.replaceAll('.', '-')}-`
2323
}),
2424
dts({
25-
tsconfig: './tsconfig.lib.json'
25+
tsconfig: './tsconfig.src.json'
2626
})
2727
]
2828
});

src/EditCell.tsx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ import type {
1111
RenderEditCellProps
1212
} from './types';
1313

14-
declare global {
15-
const scheduler: Scheduler | undefined;
16-
}
17-
18-
interface Scheduler {
19-
readonly postTask?: (
20-
callback: () => void,
21-
options?: {
22-
priority?: 'user-blocking' | 'user-visible' | 'background';
23-
signal?: AbortSignal;
24-
delay?: number;
25-
}
26-
) => Promise<unknown>;
27-
}
28-
2914
/*
3015
* To check for outside `mousedown` events, we listen to all `mousedown` events at their birth,
3116
* i.e. on the window during the capture phase, and at their death, i.e. on the window during the bubble phase.

src/css.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module '*.css' {}

src/globals.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ declare module 'react' {
55
}
66
}
77

8-
// somehow required to make `declare global` work
8+
// somehow required to make types work
99
export {};

test/globals.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ declare module 'vitest/browser' {
99
}
1010
}
1111

12-
// somehow required to make `declare global` work
12+
// somehow required to make types work
1313
export {};

test/setupBrowser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ afterEach(() => {
9393
// eslint-disable-next-line vitest/no-standalone-expect
9494
expect
9595
.soft(
96-
// eslint-disable-next-line @eslint-react/purity
9796
document.hasFocus(),
9897
'Focus is set on a browser UI element at the end of a test. Use safeTab() to return focus to the page.'
9998
)

0 commit comments

Comments
 (0)