Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const baseConfig = require("../../.lintstagedrc.js");
import baseConfig from "../../lint-staged.config.mjs";

module.exports = {
export default {
...baseConfig,
"*.{m,c,}js": ["eslint --fix", "prettier --write"],
};
17 changes: 17 additions & 0 deletions .markdownlint-cli2.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint-cli2/main/schema/markdownlint-cli2-config-schema.json",
"config": {
"first-line-heading": false,
"no-inline-html": false,
"line-length": false,
"code-block-style": { "style": "fenced" },
"code-fence-style": { "style": "backtick" },
"heading-style": { "style": "atx" },
"no-duplicate-heading": { "siblings_only": true },
"emphasis-style": { "style": "asterisk" },
"strong-style": { "style": "asterisk" },
"ul-style": { "style": "dash" },
},
"gitignore": true,
"ignores": ["**/THIRD-PARTY-LICENSES.md"],
}
2 changes: 0 additions & 2 deletions .markdownlintignore

This file was deleted.

13 changes: 0 additions & 13 deletions .markdownlintrc

This file was deleted.

4 changes: 2 additions & 2 deletions .lintstagedrc.js → lint-staged.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
export default {
"*.{json,html,yml}": ["prettier --write"],
"*.{s,}css": ["prettier --write"],
"*.md": ["prettier --write", "markdownlint --fix"],
"*.md": ["prettier --write", "markdownlint-cli2 --fix"],
};
200 changes: 50 additions & 150 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build": "turbo run build --log-order=stream",
"clean": "turbo run clean --log-order=stream && git clean -fd && rimraf node_modules .turbo",
"lint": "concurrently \"npm:lint:*\" \"turbo run lint --log-order=stream\"",
"lint:md": "prettier --write \"*.md\" >/dev/null && markdownlint --fix \"*.md\"",
"lint:md": "prettier --write \"*.md\" >/dev/null && markdownlint-cli2 --fix \"*.md\"",
"lint:yml": "prettier --write \".github/**/*.yml\" >/dev/null",
"lint:js": "eslint -c .github/scripts/eslint.config.cjs --fix .github/scripts/ && prettier --write \".github/**/*.{c,m,}js\" >/dev/null",
"lint:json": "prettier --write \"{.vscode,}/*.json\" >/dev/null",
Expand Down Expand Up @@ -98,7 +98,7 @@
"jest-axe": "10.0.0",
"lerna": "8.2.1",
"lint-staged": "15.5.0",
"markdownlint-cli": "0.44.0",
"markdownlint-cli2": "0.17.2",
"postcss": "8.5.3",
"prettier": "3.5.3",
"puppeteer": "23.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"compile": "npm run tsc",
"lint": "concurrently npm:lint:*",
"lint:json": "prettier --write \"**/*.json\" >/dev/null",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint \"**/*.md\" --fix --dot --ignore-path ../../.gitignore",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
"tsc": "tsc",
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ __docs-temp__/*
docs/
hydrate/
*.js
!/.lintstagedrc.js
!/lint-staged.config.mjs
src/components/icon/assets
node_modules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import baseConfig from "../../.lintstagedrc.js";
import baseConfig from "../../lint-staged.config.mjs";

export default {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"lint": "concurrently npm:lint:*",
"lint:html": "prettier --write \"**/*.html\" >/dev/null",
"lint:json": "prettier --write \"**/*.json\" >/dev/null",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint \"**/*.md\" --fix --dot --ignore-path .gitignore",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
"lint:scss": "stylelint --fix \"src/**/*.scss\" && prettier --write \"**/*.scss\" >/dev/null",
"lint:ts": "eslint --fix . && prettier --write \"**/*.{ts,tsx,cjs,mjs}\" >/dev/null",
"prepublish": "./support/cleanupDistFiles.sh",
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/tsconfig-eslint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig-base",
"include": [".storybook/*", "**/*", "**/*.config.js", "eslint.config.mjs", "**/.*.cjs"],
"include": ["**/*", "**/*.config.mjs", "**/.*.cjs", ".storybook/*"],
"exclude": ["**/[!_]*assets*/**", "dist", "hydrate", "docs"]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import baseConfig from "../../.lintstagedrc.js";
import baseConfig from "../../lint-staged.config.mjs";

export default {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-design-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"build:watch:test": "MODE='test' npm run build:watch",
"clean": "rimraf node_modules dist .turbo",
"lint:json": "prettier --write \"**/*.json\" >/dev/null",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint \"**/*.md\" --fix --dot --ignore-path ../../.gitignore",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
"lint:ts": "eslint --fix . && prettier --write \"**/*.{ts,tsx,cjs,mjs}\" >/dev/null",
"lint": "concurrently npm:lint:*",
"test": "vitest",
Expand Down
Loading
Loading