Merge branch 'master' into dependabot/npm_and_yarn/browserslist-4.16.6

Author: markzegarelli

.vale.ini

@@ -4,3 +4,4 @@ Vocab = Docs
 
 [*.md]
 BasedOnStyles = write-good, segment
+TokenIgnores = ({% .* %})

package-lock.json

@@ -22,6 +22,8 @@ const slugify = (displayName) => {
   if (slug === 'roku-alpha') slug = 'roku'
   if (slug === 'shopify-by-littledata') slug = 'shopify-littledata'
   if (slug === 'talon-one') slug = 'talonone'
+  if (slug == 'google-adwords-remarketing-lists-customer-match') slug = 'adwords-remarketing-lists'
+  if (slug == 'canny-classic') slug = 'canny'
   return slug
 }
 

scripts/catalog.js

@@ -6,8 +6,13 @@ log=$(env -i git log -1 --pretty=%B)
 # run a series of checks for common reasons that we shouldn't preview build.
 # if no checks match, exit with code 1 to run the build
 
+# Force a build
+if echo $log | grep -1 'netlify\-build'; then
+echo "Force build becuase Netlify is a benevolent overseer"
+exit 1
+
 # ignore for simple typo fixes
-if echo "$log" | grep -q 'typo'; then
+elif echo "$log" | grep -q 'typo'; then
 echo "Build ignored because 'typo' is in the commit message."
 exit
 # ignore link / url updates
@@ -23,7 +28,7 @@ elif echo "$log" | grep -q 'dependabot'; then
 echo "Ignoring dependabot update"
 exit
 # ignore when master is merged into a branch
-elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
+elif echo "$log" | grep -q 'Merge branch \Smaster\S'; then
 echo "Build ignored because it's only an update from the main branch."
 exit
 else

scripts/ignore.sh

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination categories last updated 2021-05-18 
+# destination categories last updated 2021-06-23 
 items:
 - display_name: Email Marketing
   slug: email-marketing