Skip to content

Commit 3df9528

Browse files
merging all conflicts
2 parents de86963 + e07ac94 commit 3df9528

Some content is hidden

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

61 files changed

+3078
-36
lines changed

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
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",
2323
"rss": "node scripts/generateRss.js",
24+
<<<<<<< HEAD
2425
"textlint": "cd textlint && yarn --frozen-lockfile && yarn textlint",
2526
"textlint-staged": "cd textlint && yarn --frozen-lockfile && yarn textlint-staged --"
27+
=======
28+
"deadlinks": "node scripts/deadLinkChecker.js"
29+
>>>>>>> e07ac94bc2c1ffd817b13930977be93325e5bea9
2630
},
2731
"dependencies": {
2832
"@codesandbox/sandpack-react": "2.13.5",
@@ -32,7 +36,6 @@
3236
"@radix-ui/react-context-menu": "^2.1.5",
3337
"body-scroll-lock": "^3.1.3",
3438
"classnames": "^2.2.6",
35-
"date-fns": "^2.16.1",
3639
"debounce": "^1.2.1",
3740
"github-slugger": "^1.3.0",
3841
"next": "15.1.0",
@@ -64,6 +67,7 @@
6467
"autoprefixer": "^10.4.2",
6568
"babel-eslint": "10.x",
6669
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
70+
"chalk": "4.1.2",
6771
"eslint": "7.x",
6872
"eslint-config-next": "12.0.3",
6973
"eslint-config-react-app": "^5.2.1",

0 commit comments

Comments
 (0)