Merge branch 'master' into downloadIconsSupportSrc

Author: lee-leonardo

lib/manifestTools/assets/web-manifest.json

@@ -39,7 +39,7 @@
       "format": "uri"
     },
     "theme_color": {
-      "description": "background color for splash screen and icons",
+      "description": "The default theme color for the browsing contexts of an application",
       "type": "string"
     },
     "dir": {
@@ -68,8 +68,29 @@
     "prefer_related_applications": {
       "description": "A boolean value that is used as a hint for the user agent to say that related applications should be preferred over the web application.",
       "type": "boolean"
+    },
+    "categories": {
+      "description": "An array of strings defining the expected application categories to which the web application belongs. While any string is considered valid, W3C maintains a list of known category strings at https://github.com/w3c/manifest/wiki/Categories",
+      "type": "array"
+    },
+    "screenshots": {
+      "description": "An array of images representing the application in common usage scenarios.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/icon"
+      }
+    },
+    "iarc_rating_id": {
+      "description": "The International Age Rating Coalition (IARC) certification code of the web application. It is intended to be used to determine which ages the web application is appropriate for.",
+      "type": "string"
+    },
+    "shortcuts": {
+      "description": "An array of shortcut items that provide access to key tasks within a web application.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/shortcutItem"
+      }
     }
-    
   },
 
   "definitions": {
@@ -97,6 +118,15 @@
           "description": "The type member of an icon is a hint as to the media type of the icon.",
           "type": "string",
           "pattern": "^[\\sa-z0-9\\-+;\\.=\\/]+$"
+        },
+        "purpose": {
+          "description": "An unordered set of unique space-separated tokens that are ASCII case-insensitive. The allowed values are the icon purposes.",
+          "type": "string",
+          "enum": [ "badge", "maskable", "any" ]
+        },
+        "platform": {
+          "description": "The platform to which a containing object applies.",
+          "type": "string"
         }
       }
     },
@@ -117,6 +147,35 @@
           "type": "string"
         }
       }
+    },
+    "shortcutItem": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "The name of the shortcut as it is usually displayed to the user in a context menu.",
+          "type": "string"
+        },
+        "short_name": {
+          "description": "A short version of the name of the shortcut. It is intended to be used where there is insufficient space to display the full name of the shortcut.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Describes the purpose of the shortcut. User agents MAY expose this information to assistive technology",
+          "type": "string"
+        },
+        "url": {
+          "description": "The URL within the application's scope that opens when the associated shortcut is activated.",
+          "type": "string",
+          "format": "uri"
+        },
+        "icons": {
+          "description": "The images to serve as iconic representations of the shortcut in various contexts.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/icon"
+          }
+        }
+      }
     }
   }
 }

lib/manifestTools/manifestCreator/index.js

@@ -39,15 +39,15 @@ function manifestCreator(opts, callback) {
       'Dir',
       'Lang',
       'Name',
+      'Short_name',
       'Icons',
       'Scope',
       'Display',
       'Start_url',
-      'Short_name',
+      'Background_color',
       'Theme_color',
       'Description',
       'Orientation',
-      'Background_color',
       'Related_applications',
       'Prefer_related_applications'
     ].map(function(name) {

lib/manifestTools/manifestLoader.js

@@ -20,6 +20,7 @@ var constants = require('../constants'),
 var manifestCreator = require('./manifestCreator');
 
 // Request settings taken from https://github.com/InternetExplorer/modern.IE-static-code-scan/blob/master/app.js
+// Then the user agent is updated to that of a PWA-capable browser
 var request = request.defaults({
   followAllRedirects: true,
   encoding: null,
@@ -29,7 +30,7 @@ var request = request.defaults({
   headers: {
     'Accept': 'text/html, application/xhtml+xml, */*',
     'Accept-Language': 'en-US,en;q=0.5',
-    'User-Agent': 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)'
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36'
   }
 });