Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Pinned webdriver and co versions, updated eslint #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 59 additions & 44 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,46 +1,61 @@
{
"rules": {
"array-bracket-spacing": 2,
"block-spacing": [2, "never"],
"brace-style": [2, "1tbs", { "allowSingleLine": false }],
"camelcase": [2, {"properties": "always"}],
"curly": 2,
"default-case": 2,
"dot-notation": 2,
"eqeqeq": 2,
"indent": [
2,
2,
{"SwitchCase": 1}
],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"max-len": [2, 80, 2, {"ignoreUrls": true}],
"new-cap": 2,
"no-console": 0,
"no-else-return": 2,
"no-eval": 2,
"no-multi-spaces": 2,
"no-multiple-empty-lines": [2, {"max": 2}],
"no-shadow": 2,
"no-trailing-spaces": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, {"args": "none"}],
"object-curly-spacing": [2, "never"],
"padded-blocks": [2, "never"],
"quotes": [
2,
"single"
],
"semi": [
2,
"always"
],
"space-after-keywords": 2,
"space-before-blocks": 2,
"space-before-function-paren": [2, "never"],
"spaced-comment": 2,
"valid-typeof": 2
},
"extends": "eslint:recommended",
"globals": {}
"rules": {
"array-bracket-spacing": 2,
"block-spacing": [2, "never"],
"brace-style": [2, "1tbs", {"allowSingleLine": false}],
"camelcase": [2, {"properties": "always"}],
"curly": 2,
"default-case": 2,
"dot-notation": 2,
"eqeqeq": 2,
"indent": [
2,
2,
{"SwitchCase": 1}
],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"keyword-spacing": 2,
"max-len": [2, 80, 2, {"ignoreUrls": true}],
"new-cap": [2, {"newIsCapExceptions": [
"webkitRTCPeerConnection",
"mozRTCPeerConnection"
]}],
"no-console": 0,
"no-else-return": 2,
"no-eval": 2,
"no-multi-spaces": 2,
"no-multiple-empty-lines": [2, {"max": 2}],
"no-shadow": 2,
"no-trailing-spaces": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, {"args": "none"}],
"object-curly-spacing": [2, "never"],
"padded-blocks": [2, "never"],
"quotes": [
2,
"single"
],
"semi": [
2,
"always"
],
"space-before-blocks": 2,
"space-before-function-paren": [2, "never"],
"space-unary-ops": 2,
"space-infix-ops": 2,
"spaced-comment": 2,
"valid-typeof": 2
},
"env": {
"browser": true,
"node": true
},
"extends": ["eslint:recommended", "webrtc"],
"globals": {
"module": true,
"require": true,
"process": true,
"Promise": true,
"Map": true
}
}
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),
eslint: {
options: {
configFile: '.eslintrc'
configFile: '.eslintrc',
cache: true
},
target: ['src/**/*.js', 'main.js']
},
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"url": "https://github.com/webrtc/utilities.git"
},
"dependencies": {
"chromedriver": "2.28.0",
"chromedriver": "2.29.0",
"geckodriver": "1.4.0",
"selenium-webdriver": "^3.0.0",
"selenium-webdriver": "3.3.0",
"tape": "^4.0.0",
"travis-multirunner": "^3.0.0"
},
Expand All @@ -23,14 +23,15 @@
"test": "grunt && ./test/start-tests.sh"
},
"devDependencies": {
"eslint-config-webrtc": "^1.0.0",
"grunt": "^0.4.5",
"grunt-cli": ">=0.1.9",
"grunt-eslint": "^17.2.0",
"grunt-eslint": "^19.0.0",
"grunt-githooks": "^0.3.1",
"chromedriver": "^2.16.0",
"selenium-webdriver": "^3.0.0",
"chromedriver": "^2.29.0",
"selenium-webdriver": "^3.3.0",
"tape": "^4.0.0",
"travis-multirunner": "^3.0.0",
"webrtc-adapter": "^2.0.0"
"webrtc-adapter": "^3.0.0"
}
}