Merge branch 'dev' into cleanupCode

Author: lucaasrojas

assets/serviceWorkers/serviceworkers.json

@@ -71,7 +71,7 @@ function processManifestContents (data, manifestFormat, callback) {
     log.warn('Forcing to format ' + manifestFormat + '...');
     detectedFormat = manifestFormat;
   } else if (!detectedFormat) {
-      detectedFormat = 'w3c'
+      detectedFormat = 'w3c';
   }
 
   log.info('Found a ' + detectedFormat + ' manifest...');
@@ -149,7 +149,8 @@ function getManifestFromSite (siteUrl, manifestFormat, callback) {
         .then(function(manifest) {
             var manifestObj = {
               content: manifest,
-              format: constants.BASE_MANIFEST_FORMAT
+              format: constants.BASE_MANIFEST_FORMAT,
+              generated:true
             };
 
             return manifestObj;
@@ -162,7 +163,8 @@ function getManifestFromSite (siteUrl, manifestFormat, callback) {
               'start_url': _url.parse(siteUrl).path,
               'short_name': utils.getDefaultShortName(siteUrl)
             },
-            format: constants.BASE_MANIFEST_FORMAT
+            format: constants.BASE_MANIFEST_FORMAT,
+            generated:true
           };
 
           return manifestObj;

lib/manifestTools/manifestLoader.js

@@ -1,6 +1,6 @@
 {
   "name": "pwabuilder-lib",
-  "version": "2.0.2-RC.0",
+  "version": "2.0.4-RC.0",
   "description": "PWA Builder Core Library",
   "repository": {
     "type": "git",
@@ -30,44 +30,45 @@
     "ManifoldJS"
   ],
   "dependencies": {
-    "adm-zip": "^0.4.7",
+    "adm-zip": "^0.4.11",
     "ansi": "^0.3.1",
-    "async": "^1.5.2",
-    "cheerio": "^0.20.0",
-    "eslint-config-hapi": "^9.1.0",
-    "expect": "^1.20.1",
-    "file-type": "^3.8.0",
-    "image-size": "^0.5.0",
-    "image-type": "^2.1.0",
-    "jimp": "^0.2.24",
+    "async": "^2.6.1",
+    "cheerio": "^1.0.0-rc.2",
+    "eslint-config-hapi": "^12.0.0",
+    "eslint-plugin-hapi": "^4.1.0",
+    "expect": "^23.6.0",
+    "file-type": "^10.0.0",
+    "image-size": "^0.6.3",
+    "image-type": "^3.0.0",
+    "jimp": "^0.5.4",
     "langdetect": "^0.2.1",
-    "lodash": "^4.13.1",
-    "loglevel": "^1.4.0",
-    "mime-types": "^2.1.11",
+    "lodash": "^4.17.11",
+    "loglevel": "^1.6.1",
+    "mime-types": "^2.1.20",
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
-    "pwabuilder-serviceworkers": "^1.1.0",
-    "q": "^1.4.1",
-    "request": "^2.67.0",
-    "semver": "^5.1.0",
-    "strip-combining-marks": "^0.1.0",
+    "pwabuilder-serviceworkers": "^1.1.2",
+    "q": "^1.5.1",
+    "request": "^2.88.0",
+    "semver": "^5.6.0",
+    "strip-combining-marks": "^1.0.0",
     "tld-extract": "^1.0.1",
-    "tv4": "^1.2.7",
+    "tv4": "^1.3.0",
     "valid-url": "^1.0.9",
-    "xregexp": "^3.1.1"
+    "xregexp": "^4.2.0"
   },
   "devDependencies": {
     "blanket": "1.1.6",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-contrib-watch": "^0.6.1",
+    "grunt": "^1.0.3",
+    "grunt-cli": "^1.3.2",
+    "grunt-contrib-jshint": "^2.0.0",
+    "grunt-contrib-nodeunit": "^2.0.0",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-mocha-test": "^0.12.7",
     "jshint-stylish": "^1.0.0",
     "jshint-teamcity": "^1.0.6",
-    "load-grunt-tasks": "^1.0.0",
-    "mocha": "^2.1.0",
+    "load-grunt-tasks": "^4.0.0",
+    "mocha": "^5.2.0",
     "mocha-teamcity-reporter": "0.0.4",
     "should": "^5.0.1",
     "time-grunt": "^1.0.0",