WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 79d99fe

Browse files
chore: fix merge conflict
Looks like there was a bad merge conflict in 5f3fca4
1 parent 569a6e8 commit 79d99fe

File tree

3 files changed

+12152
-12173
lines changed

3 files changed

+12152
-12173
lines changed

package.json

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"namespace": "@tanstack",
44
"private": true,
55
"repository": "https://github.com/tanstack/table.git",
6-
"packageManager": "pnpm@8.12.1",
6+
"packageManager": "pnpm@10.16.1",
77
"type": "module",
88
"scripts": {
99
"clean": "pnpm --filter \"./packages/**\" run clean",
@@ -23,8 +23,8 @@
2323
"dev": "pnpm run watch",
2424
"prettier": "prettier --ignore-unknown '**/*'",
2525
"prettier:write": "pnpm run prettier --write",
26-
"cipublish": "node scripts/publish.js",
27-
"verify-links": "node scripts/verify-links.ts"
26+
"verify-links": "node scripts/verify-links.ts",
27+
"cipublish": "node scripts/publish.js"
2828
},
2929
"nx": {
3030
"includedScripts": [
@@ -44,40 +44,37 @@
4444
}
4545
],
4646
"devDependencies": {
47-
"@babel/core": "^7.24.3",
48-
"@babel/preset-env": "^7.24.3",
49-
"@babel/preset-react": "^7.24.1",
50-
"@babel/preset-typescript": "^7.24.1",
47+
"@babel/core": "^7.24.7",
48+
"@babel/preset-env": "^7.24.7",
49+
"@babel/preset-react": "^7.24.7",
50+
"@babel/preset-typescript": "^7.24.7",
5151
"@faker-js/faker": "^8.4.1",
5252
"@rollup/plugin-babel": "^6.0.4",
53-
"@rollup/plugin-commonjs": "^25.0.7",
53+
"@rollup/plugin-commonjs": "^26.0.1",
5454
"@rollup/plugin-node-resolve": "^15.2.3",
55-
"@rollup/plugin-replace": "^5.0.5",
55+
"@rollup/plugin-replace": "^5.0.7",
5656
"@rollup/plugin-terser": "^0.4.4",
57-
"@size-limit/preset-small-lib": "^11.1.2",
58-
"@tanstack/config": "^0.6.0",
59-
"@testing-library/jest-dom": "^6.4.2",
60-
"@testing-library/react": "^14.2.2",
57+
"@size-limit/preset-small-lib": "^11.1.4",
58+
"@tanstack/config": "^0.13.0",
59+
"@testing-library/jest-dom": "^6.4.6",
60+
"@testing-library/react": "^16.0.0",
6161
"@testing-library/react-hooks": "^8.0.1",
62-
"@types/node": "^20.11.30",
63-
"jsdom": "^24.0.0",
64-
"knip": "^5.5.0",
65-
"nx": "^18.1.3",
66-
"prettier": "^4.0.0-alpha.8",
67-
"prettier-plugin-svelte": "^3.2.2",
68-
"rimraf": "^5.0.5",
69-
"rollup": "^4.13.0",
62+
"@types/node": "^20.14.9",
63+
"jsdom": "^24.1.0",
64+
"knip": "^5.23.2",
65+
"markdown-link-extractor": "^4.0.2",
66+
"nx": "^19.3.2",
67+
"prettier": "^3.3.2",
68+
"prettier-plugin-svelte": "^3.2.5",
69+
"rimraf": "^5.0.7",
70+
"rollup": "^4.18.0",
7071
"rollup-plugin-size": "^0.3.1",
71-
"rollup-plugin-svelte": "^7.2.0",
72+
"rollup-plugin-svelte": "^7.2.2",
7273
"rollup-plugin-visualizer": "^5.12.0",
73-
"sherif": "^0.8.1",
74-
"size-limit": "^11.1.2",
75-
"typescript": "5.4.3",
76-
"vitest": "^1.4.0",
77-
"@types/glob": "^8.1.0",
78-
"fast-glob": "^3.3.3",
79-
"glob": "^8.1.0",
80-
"markdown-link-extractor": "^4.0.2",
81-
"ts-node": "^10.9.2"
74+
"sherif": "^0.9.0",
75+
"size-limit": "^11.1.4",
76+
"tinyglobby": "^0.2.15",
77+
"typescript": "5.4.5",
78+
"vitest": "^1.6.0"
8279
}
8380
}

0 commit comments

Comments
 (0)