Add YAML normalization

.circleci/config.yml

@@ -96,6 +96,16 @@ jobs:
           name: Lint JavaScript
           command: make lint-js
 
+  lint-yaml:
+    docker:
+      - image: cimg/ruby:2.7-node
+    steps:
+      - checkout
+      - install-dependencies
+      - run:
+          name: Lint YAML
+          command: make lint-yaml
+
   typecheck-js:
     docker:
       - image: cimg/ruby:2.7-node

Makefile

@@ -18,7 +18,11 @@ lint-assets:
 	npm run optimize-assets > /dev/null
 	git diff --quiet assets/img || (echo "Error: Optimize SVG images using 'npm run optimize-assets'"; exit 1)
 
-lint: lint-js lint-assets validate-lockfiles typecheck-js
+lint-yaml:
+	npm run normalize-yaml
+	(! git diff --name-only | grep ".*\.yml$$") || (echo "Error: Run 'make normalize_yaml' to normalize YAML"; exit 1)
+
+lint: lint-js lint-assets lint-yaml validate-lockfiles typecheck-js
 
 test: build
 	bundle exec rspec spec

_data/nav.yml

@@ -5,23 +5,22 @@ default:
       developer_guide: 'https://developers.login.gov'
     learn:
       about_us: '$LOCALE_BASE_URL/about-us/'
-      join_us: "$LOCALE_BASE_URL/join/"
-      policies: '$LOCALE_BASE_URL/policy/'
       accessibility: '$LOCALE_BASE_URL/accessibility/'
+      join_us: '$LOCALE_BASE_URL/join/'
+      policies: '$LOCALE_BASE_URL/policy/'
     support:
-      help_center: '$LOCALE_BASE_URL/help/'
       contact_us: '$LOCALE_BASE_URL/contact/'
+      help_center: '$LOCALE_BASE_URL/help/'
 partners:
   footer:
+    about_login_gov:
+      accessibility: '$BASE_URL/accessibility/'
+      policies: '$BASE_URL/policy/'
+      what_is_login_gov: '$BASE_URL/about-us/'
     partners:
-      get_started: '$BASE_URL/partners/get-started/'
       developer_guide: 'https://developers.login.gov'
+      get_started: '$BASE_URL/partners/get-started/'
       security_experience: '$BASE_URL/partners/security-experience/'
-    about_login_gov:
-      what_is_login_gov: '$BASE_URL/about-us/'
-      policies: '$BASE_URL/policy/'
-      accessibility: '$BASE_URL/accessibility/'
     support:
-      faq: '$BASE_URL/partners/faq/'
       business_inquiries: '$BASE_URL/partners/business-inquiries/'
-
+      faq: '$BASE_URL/partners/faq/'

package.json

@@ -10,6 +10,7 @@
     "build": "concurrently \"npm:build:*\"",
     "watch": "concurrently \"npm:watch:*\"",
     "pages": "npm run build",
+    "normalize-yaml": "find _data -name '*.yml' | xargs npm exec normalize-yaml",
     "optimize-assets": "svgo -r -f assets/img",
     "lint": "eslint .",
     "typecheck": "tsc",
@@ -33,6 +34,7 @@
   "keywords": [],
   "devDependencies": {
     "@18f/eslint-plugin-identity": "^2.0.0",
+    "@18f/identity-normalize-yaml": "^1.0.0",
     "@axe-core/puppeteer": "^4.5.1",
     "@babel/eslint-plugin": "^7.14.5",
     "@types/jest": "^29.2.6",