Merge branch 'master' into TIMOB-26662

.eslintignore

@@ -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/

.eslintrc

@@ -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" }]
       }
     },
     {
@@ -32,7 +36,7 @@
     {
       "files": [ "build/**/*.js" ],
       "parserOptions": {
-        "ecmaVersion": 2017,
+        "ecmaVersion": 2018,
         "sourceType": "script"
       }
     },
@@ -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" }]
       }
     },
     {

.gitignore

@@ -21,20 +21,7 @@ retirejs.output.json
 
 /titanium-mobile-mocha-suite
 junit.*.xml
-
-# intelliJ Android User-specific configurations
-/android/.idea/libraries/
-/android/.idea/workspace.xml
-/android/.idea/tasks.xml
-/android/.idea/.name
-/android/.idea/compiler.xml
-/android/.idea/copyright/profiles_settings.xml
-/android/.idea/encodings.xml
-/android/.idea/misc.xml
-/android/.idea/modules.xml
-/android/.idea/scopes/scope_settings.xml
-/android/.idea/vcs.xml
-*.iml
+junit_report.xml
 
 /iphone/TitaniumKit/Carthage
 /iphone/TitaniumKit/docs
@@ -43,3 +30,20 @@ junit.*.xml
 
 .vscode/
 /android/runtime/v8/src/native/V8Snapshots.h
+
+.nyc_output/
+coverage/
+
+/android/titanium/.settings
+/android/titanium/.project
+/android/titanium/.classpath
+/android/kroll-apt/bin
+/android/kroll-apt/.settings
+/android/kroll-apt/.project
+/android/kroll-apt/.classpath
+/android/app/.settings
+/android/app/.project
+/android/app/.classpath
+/android/.settings
+/android/.project
+/android/titanium/.cxx