Skip to content

Commit

Permalink
Merge branch 'master' into singleTap
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga committed Nov 21, 2019
2 parents afcbcbf + d9c52bd commit 1a40497
Show file tree
Hide file tree
Showing 171 changed files with 9,241 additions and 4,187 deletions.
16 changes: 16 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
node_modules
# We don't want to lint the locale files with eslint
**/locales/**/*.js

android/runtime/v8/tools/bootstrap.js
android/dev
android/modules/ui/assets/Resources/ti.internal/webview/*.js

iphone/Resources/app.js

# TODO: We probably do want to lint these eventually!
templates/**


titanium-mobile-mocha-suite/
dist/
android/**/generated/
24 changes: 15 additions & 9 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
{
"extends": [ "axway/env-node", "axway/+mocha"],
"parserOptions": {
"ecmaVersion": 2015,
"ecmaVersion": 2017,
"sourceType": "script"
},
"globals": {
"Ti": false,
"Titanium": false,
"__filename": false,
"__dirname": false,
"kroll": false
"Ti": "readonly",
"Titanium": "readonly",
"__filename": "readonly",
"__dirname": "readonly",
"kroll": "readonly"
},
"rules": {
"strict": ["error", "global"]
},
"overrides": [
{
"files": [ "tests/Resources/es6.*.js" ],
"files": [ "tests/Resources/es6.*.js", "tests/Resources/util.test.js" ],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"rules": {
"node/no-deprecated-api": "off",
"node/no-unsupported-features/node-builtins": ["warn", { "version": "10.11.0" }]
}
},
{
Expand All @@ -46,11 +50,13 @@
{
"files": [ "common/Resources/**/*.js" ],
"parserOptions": {
"ecmaVersion": 2017,
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"node/no-unsupported-features/es-syntax": "off"
"node/no-deprecated-api": "off",
"node/no-unsupported-features/es-syntax": "off",
"node/no-unsupported-features/node-builtins": ["warn", { "version": "10.11.0" }]
}
},
{
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ retirejs.output.json

/titanium-mobile-mocha-suite
junit.*.xml
junit_report.xml

# intelliJ Android User-specific configurations
/android/.idea/libraries/
Expand All @@ -43,3 +44,6 @@ junit.*.xml

.vscode/
/android/runtime/v8/src/native/V8Snapshots.h

.nyc_output/
coverage/
118 changes: 113 additions & 5 deletions CHANGELOG.md

Large diffs are not rendered by default.

153 changes: 0 additions & 153 deletions Gruntfile.js

This file was deleted.

0 comments on commit 1a40497

Please sign in to comment.