Merge pull request #13823 from atom/as-use-babel6

Upgrade to Babel 6 and apply fewer transformations when transpiling babel files

package.json

@@ -18,7 +18,18 @@
     "atom-keymap": "7.1.20",
     "atom-select-list": "0.0.12",
     "atom-ui": "0.4.1",
-    "babel-core": "5.8.38",
+    "babel-core": "6.22.1",
+    "babel-plugin-add-module-exports": "0.2.1",
+    "babel-plugin-transform-async-to-generator": "6.22.0",
+    "babel-plugin-transform-class-properties": "6.23.0",
+    "babel-plugin-transform-decorators-legacy": "1.3.4",
+    "babel-plugin-transform-do-expressions": "6.22.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "6.23.0",
+    "babel-plugin-transform-export-extensions": "6.22.0",
+    "babel-plugin-transform-flow-strip-types": "6.22.0",
+    "babel-plugin-transform-function-bind": "6.22.0",
+    "babel-plugin-transform-object-rest-spread": "6.23.0",
+    "babel-plugin-transform-react-jsx": "6.23.0",
     "cached-run-in-this-context": "0.4.1",
     "chai": "3.5.0",
     "chart.js": "^2.3.0",

script/package.json

@@ -3,7 +3,6 @@
   "description": "Atom build scripts",
   "dependencies": {
     "async": "2.0.1",
-    "babel-core": "5.8.38",
     "coffeelint": "1.15.7",
     "colors": "1.1.2",
     "csslint": "1.0.2",

spec/main-process/file-recovery-service.test.js

@@ -112,7 +112,7 @@ describe("FileRecoveryService", () => {
       const mockWindow = {}
       const filePath = temp.path()
       fs.writeFileSync(filePath, "content")
-      fs.chmodSync(filePath, 0444)
+      fs.chmodSync(filePath, 0o444)
 
       let logs = []
       this.stub(console, 'log', (message) => logs.push(message))

src/babel.js

@@ -6,6 +6,7 @@ var defaultOptions = require('../static/babelrc.json')
 
 var babel = null
 var babelVersionDirectory = null
+var options = null
 
 var PREFIXES = [
   '/** @babel */',
@@ -47,16 +48,27 @@ exports.compile = function (sourceCode, filePath) {
     var noop = function () {}
     Logger.prototype.debug = noop
     Logger.prototype.verbose = noop
+
+    options = {ast: false, babelrc: false}
+    for (var key in defaultOptions) {
+      if (key === 'plugins') {
+        const plugins = []
+        for (const [pluginName, pluginOptions] of defaultOptions[key]) {
+          plugins.push([require.resolve(`babel-plugin-${pluginName}`), pluginOptions])
+        }
+        options[key] = plugins
+      } else {
+        options[key] = defaultOptions[key]
+      }
+    }
   }
 
   if (process.platform === 'win32') {
     filePath = 'file:///' + path.resolve(filePath).replace(/\\/g, '/')
   }
 
-  var options = {filename: filePath}
-  for (var key in defaultOptions) {
-    options[key] = defaultOptions[key]
-  }
+  options.filename = filePath
+
   return babel.transform(sourceCode, options).code
 }
 

static/babelrc.json

@@ -1,7 +1,16 @@
 {
-  "breakConfig": true,
   "sourceMap": "inline",
-  "blacklist": ["es6.forOf", "useStrict"],
-  "optional": ["asyncToGenerator"],
-  "stage": 0
+  "plugins": [
+    ["add-module-exports", {}],
+    ["transform-async-to-generator", {}],
+    ["transform-decorators-legacy", {}],
+    ["transform-class-properties", {}],
+    ["transform-es2015-modules-commonjs", {"strictMode": false}],
+    ["transform-export-extensions", {}],
+    ["transform-do-expressions", {}],
+    ["transform-function-bind", {}],
+    ["transform-object-rest-spread", {}],
+    ["transform-flow-strip-types", {}],
+    ["transform-react-jsx", {}]
+  ]
 }