diff --git a/.circleci/config.yml b/.circleci/config.yml index 80a4ab6dda..fe6bdeaf48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,6 +97,19 @@ jobs: command: npm run proof - snyk/scan: organization: uswds + lint_and_format: + executor: my-executor + parallelism: 2 + steps: + - checkout + - attach_workspace: + at: ~/project + - run: + name: lint + command: npm run lint + - run: + name: format + command: npm run prettier:md test_a11y_desktop: executor: my-executor parallelism: 2 @@ -129,6 +142,8 @@ jobs: workflows: circle-uswds-site: jobs: + - lint_and_format: + name: Lint and format - install_ruby_deps - install_node_deps - build: diff --git a/.prettierignore b/.prettierignore index 670d8ffbe9..caa9862deb 100644 --- a/.prettierignore +++ b/.prettierignore @@ -18,5 +18,4 @@ Gemfile.lock .gitkeep *.csv *.html -*.md *.min.js \ No newline at end of file diff --git a/css/_uswds-theme-custom-styles.scss b/css/_uswds-theme-custom-styles.scss index 6ef34f8e9e..297626741b 100644 --- a/css/_uswds-theme-custom-styles.scss +++ b/css/_uswds-theme-custom-styles.scss @@ -9,7 +9,6 @@ @import "custom-styles/graphic-list"; @import "custom-styles/posts"; - // ======================================== // CUSTOM PROJECT SASS // ---------------------------------------- @@ -1570,8 +1569,6 @@ iframe { margin-bottom: units(4); } - - // Utilities CSS --------------------- // .page-content { diff --git a/package.json b/package.json index bbb008af53..03bc333f88 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,9 @@ "pa11y-ci:sitemap": "pa11y-ci --sitemap http://localhost:4000/sitemap.xml --sitemap-exclude '/*.pdf|next|together/'", "pa11y-ci:sitemap-mobile": "pa11y-ci --config .pa11yci--mobile --sitemap http://localhost:4000/sitemap.xml --sitemap-exclude '/*.pdf|next|together/'", "pa11y-ci:sitemap-json": "pa11y-ci --json > pa11y-results.json --sitemap http://localhost:4000/sitemap.xml --sitemap-exclude '/*.pdf|next|together/'", - "prettier:scss": "npx prettier --write './css/**/*.scss'" + "prettier:scss": "npx prettier --write './css/**/*.scss'", + "prettier:md": "npx prettier --write './**/*.md'", + "prettier": "npm run prettier:md && npm run prettier:scss" }, "devDependencies": { "@18f/identity-stylelint-config": "^2.0.0",