Merge pull request #5166 from magento/sync-develop

Sync develop with master

Author: jeff-matthews

Docfile.yml

@@ -12,7 +12,7 @@ content_map:
 -
   directory: mftf
   repository: magento/magento2-functional-testing-framework
-  branch: develop
+  branch: master
   filter: true
 -
   directory: page-builder

Rakefile

@@ -11,11 +11,8 @@ require 'kramdown'
 require 'launchy'
 require 'colorator'
 
-# Load ruby files with helper methods from the 'rakelib/' directory
-require_relative 'rakelib/lib/link-checker.rb'
-require_relative 'rakelib/lib/converter.rb'
-require_relative 'rakelib/lib/double-slash-check.rb'
-require_relative 'rakelib/lib/doc-config.rb'
+# Require helper methods from the 'lib' directory
+Dir.glob('lib/**/*.rb') { |file| require_relative(file) }
 
 desc "Same as 'rake', 'rake preview'"
 task default: %w[preview]
@@ -62,10 +59,17 @@ desc 'Pull docs from external repositories'
 task init: %w[multirepo:init]
 
 desc 'Run checks (image optimization).'
-task check: %w[check:image_optim check:mdl] 
+task check: %w[check:image_optim check:mdl]
 
-desc 'Generate data for the weekly digest.'
+desc 'Generate data for a news digest. Default period 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
-  sh 'whatsup_github'
+  if date.nil? or date.empty?
+    sh 'bin/whatsup_github'
+  elsif date.is_a? String
+    sh 'bin/whatsup_github', 'since', ENV['since'].to_s
+  else
+    puts 'The "since" argument must be a string/ Example: "jul 4"'
+  end
 end

_checks/html-check-hook.rb

@@ -6,7 +6,7 @@
 #
 require 'html-proofer'
 require 'yaml'
-require_relative '../rakelib/lib/double-slash-check.rb'
+require_relative '../lib/double_slash_check.rb'
 
 Jekyll::Hooks.register :site, :post_write do |site|
   # Do nothing unless 'site.check_links' is set

_config.checks.yml

@@ -4,26 +4,32 @@
 #
 html-proofer:
 
-  # Do not check external links.	
+  # Do not check external links.
   :disable_external: true
 
   # Report only errors that fall within the 4xx status code range.
   :only_4xx: true
 
   # Ignores images with empty alt tags.
   :empty_alt_ignore: true
-
+  
   # Sort errors by description in the report
   :error_sort: :desc
 
   # Use up to 3 parallel processes to speed up internal file checks.
   :parallel:
     :in_processes: 3
+  
+  :cache:
+    :timeframe: 2w
 
   # Ignore entirely the files which pathname matches a specified pattern 
   :file_ignore:
-  - !ruby/regexp /page-builder/
-  - !ruby/regexp /mrg/
+    - !ruby/regexp /page-builder/
+    - !ruby/regexp /guides\/v2\.3\/mrg/
+
+  :internal_domains:
+    - devdocs.magento.com
 
   # Ignore any link that includes a specified pattern
   # :url_ignore:

_config.yml

@@ -212,7 +212,7 @@ exclude:
   - bin
   - node_modules
   - vendor
-  - .git
+  - .github
   - .idea
   - Gemfile
   - Gemfile.lock
@@ -222,3 +222,10 @@ exclude:
   - rakelib
   - README.md
   - _plugins
+  - tmp
+  - lib
+  - rakelib
+  - scripts
+  - redirects.json
+  - Docfile.yml
+