Skip to content

Commit 73855ab

Browse files
merging all conflicts
2 parents 7b8171d + e07ac94 commit 73855ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2924
-419
lines changed

package.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,29 @@
1515
"prettier:diff": "yarn nit:source",
1616
"lint-heading-ids": "node scripts/headingIdLinter.js",
1717
"fix-headings": "node scripts/headingIdLinter.js --fix",
18-
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss",
18+
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks",
1919
"tsc": "tsc --noEmit",
2020
"start": "next start",
2121
"postinstall": "is-ci || husky install .husky",
2222
"check-all": "npm-run-all prettier lint:fix tsc rss",
23-
"rss": "node scripts/generateRss.js"
23+
"rss": "node scripts/generateRss.js",
24+
"deadlinks": "node scripts/deadLinkChecker.js"
2425
},
2526
"dependencies": {
2627
"@codesandbox/sandpack-react": "2.20.0",
2728
"@docsearch/css": "^3.9.0",
2829
"@docsearch/react": "^3.9.0",
2930
"@headlessui/react": "^1.7.0",
31+
<<<<<<< HEAD
3032
"@radix-ui/react-context-menu": "^2.2.6",
3133
"body-scroll-lock": "^3.1.5",
3234
"classnames": "^2.5.1",
3335
"date-fns": "^2.16.1",
36+
=======
37+
"@radix-ui/react-context-menu": "^2.1.5",
38+
"body-scroll-lock": "^3.1.3",
39+
"classnames": "^2.2.6",
40+
>>>>>>> e07ac94bc2c1ffd817b13930977be93325e5bea9
3441
"debounce": "^1.2.1",
3542
"github-slugger": "^1.3.0",
3643
"next": "15.1.7",
@@ -62,6 +69,7 @@
6269
"autoprefixer": "^10.4.20",
6370
"babel-eslint": "10.x",
6471
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
72+
"chalk": "4.1.2",
6573
"eslint": "7.x",
6674
"eslint-config-next": "12.0.3",
6775
"eslint-config-react-app": "^5.2.1",

0 commit comments

Comments
 (0)