Merge branch 'master' into small-changes

Author: Donald Booth

.github/workflows/linter.yml

@@ -54,4 +54,4 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
-          VALIDATE_MD: false
+          VALIDATE_MARKDOWN: false

Rakefile

@@ -69,15 +69,31 @@ task check: %w[check:image_optim check:mdl]
 
 desc 'Generate data for a news digest. Default timeframe is a week since today. For other period, use "since" argument: since="jul 4"'
 task :whatsnew do
-  date = ENV['since']
-  print 'Generating data for the weekly digest: $ '.magenta
-  if date.nil? || date.empty?
-    sh 'bin/whatsup_github'
-  elsif date.is_a? String
-    sh 'bin/whatsup_github', 'since', ENV['since'].to_s
+  since = ENV['since']
+  current_file = 'src/_data/whats-new.yml'
+  generated_file = 'tmp/whats-new.yml'
+  current_data = YAML.load_file current_file
+  last_update = current_data['updated']
+
+  print 'Generating data for the What\'s New digest: $ '.magenta
+
+  # Generate tmp/whats-new.yml
+  if since.nil? || since.empty?
+    sh 'bin/whatsup_github', 'since', last_update
+  elsif since.is_a? String
+    sh 'bin/whatsup_github', 'since', since
   else
-    puts 'The "since" argument must be a string. Example: "jul 4"'
+    abort 'The "since" argument must be a string. Example: "jul 4"'
   end
+
+  # Merge generated tmp/whats-new.yml with existing src/_data/whats-new.yml
+  generated_data = YAML.load_file generated_file
+  current_data['updated'] = generated_data['updated']
+  current_data['entries'].prepend(generated_data['entries']).flatten!
+  current_data['entries'].uniq! { |entry| entry['link'] }
+
+  puts "Writing updates to #{current_file}"
+  File.write current_file, current_data.to_yaml
 end
 
 desc 'Generate index for Algolia'

src/_data/main-nav.yml

@@ -179,8 +179,6 @@
     - label: Web API Functional Testing
       url: /get-started/web-api-functional-testing.html
 
--
-
 - label: Functional Areas
   children: