Skip to content

Commit 0ba1ad2

Browse files
merging all conflicts
2 parents 894855e + e07ac94 commit 0ba1ad2

Some content is hidden

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

56 files changed

+3061
-9
lines changed

package.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,25 @@
1313
"prettier:diff": "yarn nit:source",
1414
"lint-heading-ids": "node scripts/headingIdLinter.js",
1515
"fix-headings": "node scripts/headingIdLinter.js --fix",
16+
<<<<<<< HEAD
1617
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss lint-editorconfig",
18+
=======
19+
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks",
20+
>>>>>>> e07ac94bc2c1ffd817b13930977be93325e5bea9
1721
"tsc": "tsc --noEmit",
1822
"start": "next start",
1923
"postinstall": "is-ci || husky install .husky",
2024
"check-all": "npm-run-all prettier lint:fix tsc rss",
2125
"rss": "node scripts/generateRss.js",
26+
<<<<<<< HEAD
2227
"cache-reset": "rm -rf node_modules/.cache && rm -rf .next && yarn cache clean",
2328
"lint-editorconfig": "yarn editorconfig-checker",
2429
"textlint-test": "yarn mocha ./textlint/tests/utils && yarn mocha ./textlint/tests/rules",
2530
"textlint-docs": "node ./textlint/generators/genTranslateGlossaryDocs.js && git add wiki/translate-glossary.md",
2631
"textlint-lint": "yarn textlint ./src/content --rulesdir ./textlint/rules -f pretty-error && npx --yes eslint@9 -c eslint.config.mjs"
32+
=======
33+
"deadlinks": "node scripts/deadLinkChecker.js"
34+
>>>>>>> e07ac94bc2c1ffd817b13930977be93325e5bea9
2735
},
2836
"dependencies": {
2937
"@codesandbox/sandpack-react": "2.13.5",
@@ -64,7 +72,11 @@
6472
"autoprefixer": "^10.4.2",
6573
"babel-eslint": "10.x",
6674
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
75+
<<<<<<< HEAD
6776
"editorconfig-checker": "^6.0.1",
77+
=======
78+
"chalk": "4.1.2",
79+
>>>>>>> e07ac94bc2c1ffd817b13930977be93325e5bea9
6880
"eslint": "7.x",
6981
"eslint-config-next": "12.0.3",
7082
"eslint-config-react-app": "^5.2.1",

0 commit comments

Comments
 (0)