You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2019/11/15 02:10:56 UTC
[cordova-serve] branch master updated: refactor: eslint setup (#23)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-serve.git
The following commit(s) were added to refs/heads/master by this push:
new b5d446e refactor: eslint setup (#23)
b5d446e is described below
commit b5d446e210460d9d6a723c55de7412ecf710c15c
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Fri Nov 15 11:10:50 2019 +0900
refactor: eslint setup (#23)
* replace dependencies with @cordova/eslint-config
* update eslint config
* eslint corrections
---
.eslintrc.yml | 10 +---------
package.json | 12 +++---------
spec/.eslintrc.yml | 4 ++--
spec/main.spec.js | 1 -
spec/server.spec.js | 1 -
src/browser.js | 37 +++++++++++++++++--------------------
src/platform.js | 2 --
src/server.js | 2 --
8 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/.eslintrc.yml b/.eslintrc.yml
index f6aae32..3a6b031 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,10 +1,2 @@
root: true
-extends: semistandard
-rules:
- indent:
- - error
- - 4
- camelcase: off
- padded-blocks: off
- operator-linebreak: off
- no-throw-literal: off
+extends: '@cordova/eslint-config/node'
diff --git a/package.json b/package.json
index 16453df..68075bf 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
"main": "src/main.js",
"scripts": {
"jasmine": "jasmine JASMINE_CONFIG_PATH=spec/jasmine.json",
- "eslint": "eslint .",
- "test": "npm run eslint && npm run jasmine"
+ "lint": "eslint .",
+ "test": "npm run lint && npm run jasmine"
},
"repository": {
"type": "git",
@@ -31,14 +31,8 @@
"which": "^1.3.0"
},
"devDependencies": {
+ "@cordova/eslint-config": "^2.0.0",
"jasmine": "^3.3.0",
- "eslint": "^5.0.0",
- "eslint-config-semistandard": "^13.0.0",
- "eslint-config-standard": "^12.0.0",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-node": "^8.0.0",
- "eslint-plugin-promise": "^4.0.0",
- "eslint-plugin-standard": "^4.0.0",
"rewire": "^4.0.1"
},
"engines": {
diff --git a/spec/.eslintrc.yml b/spec/.eslintrc.yml
index 043fd14..f2c42a4 100644
--- a/spec/.eslintrc.yml
+++ b/spec/.eslintrc.yml
@@ -1,2 +1,2 @@
-env:
- jasmine: true
+root: true
+extends: '@cordova/eslint-config/node-tests'
diff --git a/spec/main.spec.js b/spec/main.spec.js
index f94f14e..714f144 100644
--- a/spec/main.spec.js
+++ b/spec/main.spec.js
@@ -18,7 +18,6 @@
var main = require('..');
describe('main', function () {
-
it('exists and has expected properties', function () {
expect(main).toBeDefined();
expect(main.Router).toBeDefined();
diff --git a/spec/server.spec.js b/spec/server.spec.js
index 3010c2a..651423d 100644
--- a/spec/server.spec.js
+++ b/spec/server.spec.js
@@ -25,7 +25,6 @@ function expectPromise (obj) {
}
describe('server', function () {
-
it('exists and has expected properties', function () {
expect(server).toBeDefined();
expect(typeof server).toBe('function');
diff --git a/src/browser.js b/src/browser.js
index 6d13f3a..2e6762d 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -38,7 +38,6 @@ var NOT_SUPPORTED = 'The browser target is not supported: %target%';
* @return {Promise} Promise to launch the specified browser
*/
module.exports = function (opts) {
-
opts = opts || {};
var target = opts.target || 'default';
var url = opts.url || '';
@@ -107,25 +106,25 @@ function getBrowser (target, dataDir) {
var chromeArgs = ' --user-data-dir=/tmp/' + dataDir;
var browsers = {
- 'win32': {
- 'ie': 'iexplore',
- 'chrome': 'chrome --user-data-dir=%TEMP%\\' + dataDir,
- 'safari': 'safari',
- 'opera': 'opera',
- 'firefox': 'firefox',
- 'edge': 'microsoft-edge'
+ win32: {
+ ie: 'iexplore',
+ chrome: 'chrome --user-data-dir=%TEMP%\\' + dataDir,
+ safari: 'safari',
+ opera: 'opera',
+ firefox: 'firefox',
+ edge: 'microsoft-edge'
},
- 'darwin': {
- 'chrome': '"Google Chrome" --args' + chromeArgs,
- 'safari': 'safari',
- 'firefox': 'firefox',
- 'opera': 'opera'
+ darwin: {
+ chrome: '"Google Chrome" --args' + chromeArgs,
+ safari: 'safari',
+ firefox: 'firefox',
+ opera: 'opera'
},
- 'linux': {
- 'chrome': 'google-chrome' + chromeArgs,
- 'chromium': 'chromium-browser' + chromeArgs,
- 'firefox': 'firefox',
- 'opera': 'opera'
+ linux: {
+ chrome: 'google-chrome' + chromeArgs,
+ chromium: 'chromium-browser' + chromeArgs,
+ firefox: 'firefox',
+ opera: 'opera'
}
};
@@ -137,7 +136,6 @@ function getBrowser (target, dataDir) {
} else {
return Promise.reject(NOT_SUPPORTED.replace('%target%', target));
}
-
}
// err might be null, in which case defaultMsg is used.
@@ -176,7 +174,6 @@ function checkBrowserExistsWindows (browser, target) {
} else {
resolve();
}
-
});
return promise;
}
diff --git a/src/platform.js b/src/platform.js
index f98cf26..7d14170 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -31,7 +31,6 @@ var util = require('./util');
* @returns {*|promise}
*/
module.exports = function (platform, opts) {
-
// note: `this` is actually an instance of main.js CordovaServe
// this module is a mixin
var that = this;
@@ -50,7 +49,6 @@ module.exports = function (platform, opts) {
return resolve(that.launchServer(opts));
}
}
-
});
return retPromise;
};
diff --git a/src/server.js b/src/server.js
index 8f4e9ee..58a8868 100644
--- a/src/server.js
+++ b/src/server.js
@@ -28,10 +28,8 @@ var express = require('express');
* @returns {*|promise}
*/
module.exports = function (opts) {
-
var that = this;
var promise = new Promise(function (resolve, reject) {
-
opts = opts || {};
var port = opts.port || 8000;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org