Merge branch 'develop'

.eslintignore

@@ -1,6 +1,28 @@
-__snapshots__
+# unignore hidden files
+!.*
+
+**/__snapshots__
+**/build
+**/cypress/fixtures
+**/dist
+**/dist-test
+**/node_modules
+**/support/fixtures
+**/test/fixtures
+**/vendor
+
+# cli/types is linted by tslint/dtslint
+cli/types
+# packages/example is not linted (think about changing this)
+packages/example
+
+packages/extension/test/helpers/background.js
 packages/server/lib/scaffold/plugins/index.js
 packages/server/lib/scaffold/support/index.js
 packages/server/lib/scaffold/support/commands.js
-packages/server/test/fixtures
-packages/example/cypress
+
+packages/launcher/lib/**/*.js
+
+**/package-lock.json
+**/tsconfig.json
+**/.vscode

.eslintrc.decaffeinate.js

@@ -0,0 +1,13 @@
+const _ = require('lodash')
+const baseConfig = require('./.eslintrc.json')
+
+module.exports = _.defaultsDeep({}, baseConfig, {
+  rules: {
+    // auto-fix removing some common unnecessary returns
+    '@cypress/dev/no-return-before': 'error',
+    // make sure we use arrow callback
+    'prefer-arrow-callback': 'error',
+    // since our jscodemod scripts will format one-line-body functions as single line
+    'arrow-body-style': ['error', 'always'],
+  },
+})

.eslintrc.json

@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    "@cypress/dev"
+  ],
+  "extends": [
+    "plugin:@cypress/dev/general"
+  ],
+  "rules": {}
+}

.gitignore

@@ -13,7 +13,6 @@ _test-output
 cypress.zip
 tmp/
 .nyc_output
-.vscode/settings.json
 
 # from extension
 Cached Theme.pak
@@ -31,10 +30,7 @@ packages/driver/test/cypress/videos
 # from example
 packages/example/app
 packages/example/build
-packages/example/cypress/screenshots
-packages/example/cypress/videos
-packages/example/cypress/fixtures/profile.json
-packages/example/cypress/fixtures/users.json
+packages/example/cypress
 
 # from driver
 packages/driver/test/cypress/videos
@@ -65,3 +61,6 @@ scripts/support
 package-lock.json
 yarn.lock
 binary-url.json
+
+# Allows us to dynamically create eslint rules that override the default for Decaffeinate scripts
+.eslintrc.js

.npmrc

@@ -1,3 +1,4 @@
 loglevel=warn
 progress=false
 package-lock=false
+save-exact=true

.vscode/settings.json

@@ -0,0 +1,30 @@
+{
+  "eslint.autoFixOnSave": true,
+  "eslint.validate": [
+    {
+      "language": "javascript",
+      "autoFix": true
+    },
+    {
+      "language": "javascriptreact",
+      "autoFix": true
+    },
+    {
+      "language": "typescript",
+      "autoFix": true
+    },
+    {
+      "language": "typescriptreact",
+      "autoFix": true
+    },
+    {
+      "language": "json",
+      "autoFix": true
+    },
+    {
+      "language": "coffeescript",
+      "autoFix": false
+    },
+  ],
+  "eslint.enable": true,
+}

.vscode/tasks.json

@@ -6,24 +6,20 @@
     {
       "label": "decaffeinate-bulk file",
       "type": "shell",
-      "command": "npm run decaffeinate-bulk -- --file ${file} convert",
+      "command": "npm run decaffeinate-bulk -- convert --file ${file}",
       "problemMatcher": []
     },
     {
-      "label": "decaffeinate-bulk dir",
+      "label": "decaffeinate-bulk multiple files",
       "type": "shell",
-      "command": "npm run decaffeinate-bulk -- --dir ${fileDirname} convert",
+      "command": "npm run decaffeinate-bulk -- convert --file ${file} ${file}",
       "problemMatcher": []
     },
     {
-      "label": "decaffeinate",
-      "type": "shell",
-      "command": "npm run decaffeinate -- ${file}"
-    },
-    {
-      "label": "jscodeshift",
+      "label": "decaffeinate-bulk dir",
       "type": "shell",
-      "command": "npm run jscodeshift -- ${file}"
+      "command": "npm run decaffeinate-bulk -- --dir ${fileDirname} convert",
+      "problemMatcher": []
     }
   ]
 }

.yarnrc

@@ -0,0 +1 @@
+--ignore-engines true