Merge branch 'master' into react-dock_touch_events

.eslintrc

@@ -1,11 +1,7 @@
 {
   "root": true,
   "parser": "babel-eslint",
-  "extends": [
+  "extends": ["eslint:recommended", "plugin:react/recommended", "prettier"],
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "prettier"
-  ],
   "globals": {
     "chrome": true
   },
@@ -17,17 +13,13 @@
   },
   "rules": {
     "eol-last": ["warn"],
-    "max-len": ["warn", { "code": 120 , "ignoreComments": true }],
+    "max-len": ["warn", { "code": 120, "ignoreComments": true }],
     "quotes": ["warn", "single", "avoid-escape"],
     "jsx-quotes": ["warn", "prefer-double"],
     "react/prop-types": 0,
     "prettier/prettier": "error"
   },
-  "plugins": [
+  "plugins": ["prettier", "react", "babel"],
-    "prettier",
-    "react",
-    "babel"
-  ],
   "settings": {
     "react": {
       "version": "detect"

.travis.yml

@@ -1,12 +1,13 @@
 sudo: false
 language: node_js
 node_js:
-  - "stable"
+  - 'stable'
 cache:
   yarn: true
   directories:
-    - "node_modules"
+    - 'node_modules'
 script:
   - yarn build:all
   - yarn lint:all
+  - yarn prettier:check
   - yarn test:all

package.json

@@ -35,7 +35,8 @@
     "lint": "eslint \"**/*.{js,jsx,ts,tsx}\" --cache",
     "lint:fix": "eslint \"**/*.{js,jsx,ts,tsx}\" --fix --cache",
     "lint:all": "eslint \"**/*.{js,jsx,ts,tsx}\"",
-    "prettify": "prettier \"**/*.{js,jsx,ts,tsx,json,css,html,md}\" --write",
+    "prettify": "prettier --write .",
+    "prettier:check": "prettier --check .",
     "test": "jest --onlyChanged",
     "test:all": "jest"
   },
@@ -56,11 +57,8 @@
     }
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
+    "**/*": [
-      "prettier --write",
+      "eslint --fix",
-      "yarn lint:fix"
-    ],
-    "*.{json,css,html,md}": [
       "prettier --write"
     ]
   }

packages/d3-state-visualizer/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from"
+  ]
 }

packages/devui/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from"
+  ]
 }

packages/react-dock/.babelrc

@@ -1,4 +1,8 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from", "react-hot-loader/babel"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from",
+    "react-hot-loader/babel"
+  ]
 }

packages/redux-devtools-chart-monitor/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from"
+  ]
 }

packages/redux-devtools-cli/src/api/schema_def.graphql

@@ -10,33 +10,33 @@ type Report {
   # Report ID
   id: ID!
   # Type of the report, can be: STATE, ACTION, STATES, ACTIONS
-  type: ReportType,
+  type: ReportType
   # Briefly what happened
-  title: String,
+  title: String
   # Details supplied by the user
-  description: String,
+  description: String
   # The last dispatched action before the report was sent
-  action: String,
+  action: String
   # Stringified actions or the state or both, which should be loaded the application to reproduce the exact behavior
-  payload: String,
+  payload: String
   # Stringified preloaded state object. Could be the initial state of the app or committed state (after dispatching COMMIT action or reaching maxAge)
-  preloadedState: String,
+  preloadedState: String
   # Screenshot url or blob as a string
-  screenshot: String,
+  screenshot: String
   # User Agent String
-  userAgent: String,
+  userAgent: String
   # Application version to group the reports and versioning
-  version: String,
+  version: String
   # Used to identify the user who sent the report
-  userId: String,
+  userId: String
   # More detailed data about the user, usually it's a stringified object
-  user: String,
+  user: String
   # Everything else you want to send
-  meta: String,
+  meta: String
   # Error message which invoked sending the report
-  exception: String,
+  exception: String
   # Id to identify the store in case there are multiple stores
-  instanceId: String,
+  instanceId: String
   # Timestamp when the report was added
   added: String
   # Id to identify the application (from apps table)

packages/redux-devtools-dock-monitor/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from"
+  ]
 }

packages/redux-devtools-log-monitor/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-export-default-from"
+  ]
 }

packages/redux-devtools-slider-monitor/examples/todomvc/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "react-hot-loader/babel"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "react-hot-loader/babel"
+  ]
 }

packages/redux-devtools-test-generator/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-do-expressions"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-do-expressions"
+  ]
 }

packages/redux-devtools-trace-monitor/.babelrc

@@ -1,15 +1,13 @@
 {
-  "presets": [
+  "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"],
-    "@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"
-  ],
   "plugins": [
-    ["@babel/plugin-transform-runtime", {
-      "regenerator": true
-    }],
     [
-      "@babel/plugin-proposal-decorators",
+      "@babel/plugin-transform-runtime",
-      { "legacy": true }
+      {
+        "regenerator": true
+      }
     ],
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
     "@babel/plugin-proposal-class-properties"
   ]
 }

packages/redux-devtools/examples/counter/.babelrc

@@ -1,4 +1,7 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "react-hot-loader/babel"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "react-hot-loader/babel"
+  ]
 }

packages/redux-devtools/examples/todomvc/.babelrc

@@ -1,4 +1,8 @@
 {
   "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-function-bind", "react-hot-loader/babel"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-function-bind",
+    "react-hot-loader/babel"
+  ]
 }