Skip to content

Commit 5dc30a0

Browse files
committed
fix: fix
2 parents 58ca561 + 89c66be commit 5dc30a0

File tree

25 files changed

+46
-24142
lines changed

25 files changed

+46
-24142
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Get pnpm store directory
2121
id: pnpm-cache
2222
run: |
23-
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
23+
echo "pnpm_cache_dir=$(pnpm store path)" >> "$GITHUB_OUTPUT"
2424
2525
- name: Setup pnpm cache
2626
uses: actions/cache@v3

config/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export default {
99
type: 'none',
1010
exclude: [],
1111
},
12+
// https://github.com/alibaba/hooks/issues/2155
13+
extraBabelIncludes: ['filter-obj'],
1214
extraBabelPlugins: [
1315
[
1416
'babel-plugin-import',

jest.config.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/** esm modules to transform */
2+
const esmModules = [
3+
// `query-string` and its related dependencies
4+
'query-string',
5+
'decode-uri-component',
6+
'split-on-first',
7+
'filter-obj',
8+
];
9+
110
module.exports = {
211
preset: 'ts-jest/presets/js-with-ts',
312
testEnvironment: 'jsdom',
@@ -18,7 +27,7 @@ module.exports = {
1827
'!**/lib/**',
1928
'!**/dist/**',
2029
],
21-
transformIgnorePatterns: ['^.+\\.js$'],
30+
transformIgnorePatterns: [`node_modules/(?!(?:.pnpm/)?(${esmModules.join('|')}))`],
2231
moduleNameMapper: {
2332
'lodash-es': 'lodash',
2433
},

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@
6868
"react-shadow": "^19.0.3",
6969
"rimraf": "^3.0.2",
7070
"surge": "^0.21.3",
71-
"ts-jest": "^29.0.5",
71+
"ts-jest": "^29.1.1",
7272
"typescript": "^5.1.3",
73-
"webpack": "^4.43.0",
74-
"webpack-cli": "^3.3.10",
73+
"webpack": "^5.88.2",
74+
"webpack-cli": "^5.1.4",
7575
"webpack-merge": "^4.2.2"
7676
},
7777
"commitlint": {

packages/hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ahooks",
3-
"version": "3.7.8",
3+
"version": "3.7.9",
44
"description": "react hooks library",
55
"keywords": [
66
"ahooks",

packages/hooks/src/useAntdTable/demo/cache.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const UserList = () => {
136136
return (
137137
<div>
138138
{type === 'simple' ? searchForm : advanceSearchForm}
139-
<Table columns={columns} rowKey="email" {...tableProps} />
139+
<Table columns={columns} rowKey="email" style={{ overflow: 'auto' }} {...tableProps} />
140140

141141
<div style={{ background: '#f5f5f5', padding: 8 }}>
142142
<p>Current Table:</p>

packages/hooks/src/useAntdTable/demo/form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export default () => {
122122
return (
123123
<div>
124124
{type === 'simple' ? searchForm : advanceSearchForm}
125-
<Table columns={columns} rowKey="email" {...tableProps} />
125+
<Table columns={columns} rowKey="email" style={{ overflow: 'auto' }} {...tableProps} />
126126

127127
<div style={{ background: '#f5f5f5', padding: 8 }}>
128128
<p>Current Table:</p>

packages/hooks/src/useAntdTable/demo/init.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default () => {
126126
return (
127127
<div>
128128
{type === 'simple' ? searchForm : advanceSearchForm}
129-
<Table columns={columns} rowKey="email" {...tableProps} />
129+
<Table columns={columns} rowKey="email" style={{ overflow: 'auto' }} {...tableProps} />
130130

131131
<div style={{ background: '#f5f5f5', padding: 8 }}>
132132
<p>Current Table:</p>

packages/hooks/src/useAntdTable/demo/ready.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export default () => {
131131
<div>
132132
<Button onClick={() => setReady((r) => !r)}>toggle ready</Button>
133133
{type === 'simple' ? searchForm : advanceSearchForm}
134-
<Table columns={columns} rowKey="email" {...tableProps} />
134+
<Table columns={columns} rowKey="email" style={{ overflow: 'auto' }} {...tableProps} />
135135

136136
<div style={{ background: '#f5f5f5', padding: 8 }}>
137137
<p>Current Table:</p>

packages/hooks/src/useAntdTable/demo/table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ export default () => {
4949
},
5050
];
5151

52-
return <Table columns={columns} rowKey="email" {...tableProps} />;
52+
return <Table columns={columns} rowKey="email" style={{ overflow: 'auto' }} {...tableProps} />;
5353
};

0 commit comments

Comments
 (0)