Cleanup babel (firefox-devtools#4404)

Author: jasonLaster

.babelrc

@@ -1,22 +1,45 @@
 {
-  "presets": ["react"],
+  "presets": [
+    "react",
+
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": ["last 1 Chrome version", "last 1 Firefox version"]
+        },
+        "modules": "commonjs"
+      }
+    ]
+  ],
   "plugins": [
-    "transform-es2015-modules-commonjs",
-    "transform-es2015-block-scoping",
-    "transform-es2015-destructuring",
-    "transform-es2015-parameters",
-    "transform-es2015-spread",
     "transform-object-rest-spread",
     "transform-flow-strip-types",
-    "transform-async-to-generator",
     "syntax-trailing-function-commas",
     "transform-class-properties",
-
-    ["module-resolver", {
-      "alias": {
-        "devtools/client/shared/vendor/react": "react",
-        "devtools/client/shared/vendor/react-dom": "react-dom"
+    [
+      "module-resolver",
+      {
+        "alias": {
+          "devtools/client/shared/vendor/react": "react",
+          "devtools/client/shared/vendor/react-dom": "react-dom"
+        }
       }
-    }]
-  ]
+    ]
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        [
+          "env",
+          {
+            "targets": {
+              "node": 7
+            },
+            "modules": "commonjs"
+          }
+        ]
+      ]
+    }
+  }
 }

bin/prettier.js

@@ -27,7 +27,7 @@ const prettierProc = spawn(prettierCmd, prettierArgs);
 prettierProc.stdout.on("data", data => console.log(`${data}`));
 prettierProc.stderr.on("data", data => console.log(`stderr: ${data}`));
 prettierProc.on("close", code =>
-  console.log(`prettier exited with code ${code}`)
+  console.log(`prettier ${code === 0 ? "succeeded" : "failed"}`)
 );
 prettierProc.on("error", error => {
   if (error.code == "ENOENT") {

package.json

@@ -62,16 +62,17 @@
     "prepush": "run-p lint test flow",
     "nom": "node bin/nom",
     "build-storybook": "build-storybook",
-    "diff": "node bin/diff"
+    "diff": "node bin/diff",
+    "install": "prettier --write package.json"
   },
   "dependencies": {
-    "babel-preset-env": "^1.6.0",
+    "babel-preset-env": "^1.6.1",
     "babel-traverse": "^6.26.0",
     "babel-types": "^6.26.0",
     "babylon": "^6.18.0",
     "codemirror": "^5.28.0",
     "devtools-components": "^0.0.2",
-    "devtools-launchpad": "0.0.104",
+    "devtools-launchpad": "^0.0.106",
     "devtools-linters": "^0.0.3",
     "devtools-map-bindings": "^0.2.0",
     "devtools-reps": "^0.12.3",

src/components/ProjectSearch/TextSearch.js

@@ -131,8 +131,9 @@ export default class TextSearch extends Component {
   }
 
   renderResults() {
-    const results = this.getResults();
-    results = results.filter(result => result.matches.length > 0);
+    const results = this.getResults().filter(
+      result => result.matches.length > 0
+    );
     function getFilePath(item, index) {
       return item.filepath
         ? `${item.sourceId}-${index}`

yarn.lock

@@ -1065,7 +1065,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1, babel-plugin-transform-es2015-block-scoping@^6.7.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
@@ -1096,7 +1096,7 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transfor
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0, babel-plugin-transform-es2015-destructuring@^6.6.5:
+babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
@@ -1137,7 +1137,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.22.0, babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
@@ -1169,7 +1169,7 @@ babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es201
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1, babel-plugin-transform-es2015-parameters@^6.7.0:
+babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
@@ -1187,7 +1187,7 @@ babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transfo
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.6.5:
+babel-plugin-transform-es2015-spread@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
   dependencies:
@@ -1458,6 +1458,41 @@ babel-preset-env@^1.6.0:
     invariant "^2.2.2"
     semver "^5.3.0"
 
+babel-preset-env@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
 babel-preset-es2015@^6.16.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
@@ -2889,9 +2924,9 @@ devtools-contextmenu@^0.0.7:
   dependencies:
     devtools-modules "^0.0.32"
 
-[email protected].104:
-  version "0.0.104"
-  resolved "https://registry.yarnpkg.com/devtools-launchpad/-/devtools-launchpad-0.0.104.tgz#694ac6b4e6dbf3e3247c976418550eca8812c772"
+devtools-launchpad@^0.0.106:
+  version "0.0.106"
+  resolved "https://registry.yarnpkg.com/devtools-launchpad/-/devtools-launchpad-0.0.106.tgz#e22277ac1455d5be2571325c9d413979471a3e6b"
   dependencies:
     amd-loader "0.0.8"
     autoprefixer "^7.1.2"
@@ -2901,11 +2936,6 @@ [email protected]:
     babel-loader "^7.1.1"
     babel-plugin-module-resolver "^2.2.0"
     babel-plugin-transform-async-to-generator "^6.16.0"
-    babel-plugin-transform-es2015-block-scoping "^6.7.1"
-    babel-plugin-transform-es2015-destructuring "^6.6.5"
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.7.0"
-    babel-plugin-transform-es2015-spread "^6.6.5"
     babel-plugin-transform-flow-strip-types "^6.14.0"
     babel-plugin-transform-runtime "^6.7.5"
     babel-plugin-webpack-alias "^2.1.1"