Updated ESlint dependencies with lint corrections

apache · Jan 11, 2019 · f9c7e33 · f9c7e33
1 parent 449c77e
commit f9c7e33
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/bin/template/cordova/Api.js b/bin/template/cordova/Api.js
@@ -211,9 +211,9 @@ Api.prototype.prepare = function (cordovaProject, options) {
                     "sizes": "128x128"
                 } ******/
                 // ?Is it worth looking at file extentions?
-                return {'src': icon.src,
+                return { 'src': icon.src,
                     'type': 'image/png',
-                    'sizes': (icon.width + 'x' + icon.height)};
+                    'sizes': (icon.width + 'x' + icon.height) };
             });
             manifestJson.icons = manifestIcons;
 
@@ -230,7 +230,7 @@ Api.prototype.prepare = function (cordovaProject, options) {
             }
 
             // get start_url
-            var contentNode = this.config.doc.find('content') || {'attrib': {'src': 'index.html'}}; // sensible default
+            var contentNode = this.config.doc.find('content') || { 'attrib': { 'src': 'index.html' } }; // sensible default
             manifestJson.start_url = contentNode.attrib.src;
 
             // now we get some values from start_url page ...

diff --git a/bin/template/cordova/lib/run.js b/bin/template/cordova/lib/run.js
@@ -46,16 +46,18 @@ module.exports.run = function (args) {
     }
 
     var server = cordovaServe();
-    server.servePlatform('browser', {port: args.port, noServerInfo: true, noLogOutput: args.noLogOutput})
+    server.servePlatform('browser', { port: args.port, noServerInfo: true, noLogOutput: args.noLogOutput })
         .then(function () {
             if (!startPage) {
                 // failing all else, set the default
                 startPage = 'index.html';
             }
-            var projectUrl = url.resolve('http://localhost:' + server.port + '/', startPage);
+
+            var projectUrl = (new url.URL(`http://localhost:${server.port}/${startPage}`)).href;
+
             console.log('startPage = ' + startPage);
             console.log('Static file server running @ ' + projectUrl + '\nCTRL + C to shut down');
-            return server.launchBrowser({'target': args.target, 'url': projectUrl});
+            return server.launchBrowser({ 'target': args.target, 'url': projectUrl });
         })
         .catch(function (error) {
             console.log(error.message || error.toString());

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "apache"
   ],
   "scripts": {
-    "eslint": "eslint bin && eslint spec",
+    "eslint": "eslint bin spec",
     "jasmine": "jasmine",
     "test": "npm run eslint && npm run jasmine"
   },
@@ -28,13 +28,13 @@
     "shelljs": "^0.5.3"
   },
   "devDependencies": {
-    "eslint": "^4.0.0",
-    "eslint-config-semistandard": "^11.0.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.3.0",
-    "eslint-plugin-node": "^5.0.0",
-    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-standard": "^3.0.1",
+    "eslint": "^5.12.0",
+    "eslint-config-semistandard": "^13.0.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
     "jasmine": "^2.5.3",
     "tmp": "^0.0.26"
   },