Merge pull request #67 from atom-community/babel7

Author: aminya

package-lock.json

@@ -18,6 +18,8 @@
     "@atom/nsfw": "^1.0.28",
     "@atom/source-map-support": "^0.3.4",
     "@atom/watcher": "^1.3.5",
+    "@babel/core": "7.18.6",
+    "babel-preset-atomic": "^5.0.0",
     "about": "file:packages/about",
     "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.66.0/tarball",
     "async": "3.2.0",
@@ -34,7 +36,6 @@
     "autocomplete-snippets": "https://www.atom.io/api/packages/autocomplete-snippets/versions/1.12.1/tarball",
     "autoflow": "file:packages/autoflow",
     "autosave": "https://www.atom.io/api/packages/autosave/versions/0.24.6/tarball",
-    "babel-core": "5.8.38",
     "background-tips": "https://www.atom.io/api/packages/background-tips/versions/0.28.0/tarball",
     "base16-tomorrow-dark-theme": "file:packages/base16-tomorrow-dark-theme",
     "base16-tomorrow-light-theme": "file:packages/base16-tomorrow-light-theme",

package.json

@@ -1,5 +1,5 @@
 /** @babel */
-/** @jsx etch.dom **/
+/** @jsx etch.dom */
 
 import etch from 'etch';
 

packages/welcome/lib/guide-view.js

@@ -1,5 +1,5 @@
 /** @babel */
-/** @jsx etch.dom **/
+/** @jsx etch.dom */
 
 import etch from 'etch';
 

packages/welcome/lib/welcome-view.js

@@ -132,8 +132,14 @@ module.exports = function(packagedAppPath) {
             'lib',
             'command-event.js'
           ) ||
-        requiredModuleRelativePath ===
-          path.join('..', 'node_modules', 'babel-core', 'index.js') ||
+        (requiredModuleRelativePath.includes('@babel') &&
+          // GitHub package uses this in its relay dependency which is required on startup
+          !requiredModuleRelativePath.includes(
+            path.join('@babel', 'runtime')
+          )) ||
+        requiredModuleRelativePath.includes('babel-plugin') ||
+        requiredModuleRelativePath.includes('babel-preset') ||
+        requiredModuleRelativePath.includes('supports-color') ||
         requiredModuleRelativePath ===
           path.join('..', 'node_modules', 'debug', 'node.js') ||
         requiredModuleRelativePath ===

script/lib/generate-startup-snapshot.js

@@ -1,6 +1,6 @@
 path = require 'path'
 temp = require('temp').track()
-Babel = require 'babel-core'
+babelCompiler = require '../src/babel'
 CoffeeScript = require 'coffee-script'
 {TypeScriptSimple} = require 'typescript-simple'
 CSON = require 'season'
@@ -16,7 +16,7 @@ describe 'CompileCache', ->
     CSON.setCacheDir(null)
     CompileCache.resetCacheStats()
 
-    spyOn(Babel, 'transform').andReturn {code: 'the-babel-code'}
+    spyOn(babelCompiler, 'compile')
     spyOn(CoffeeScript, 'compile').andReturn 'the-coffee-code'
     spyOn(TypeScriptSimple::, 'compile').andReturn 'the-typescript-code'
 
@@ -36,11 +36,11 @@ describe 'CompileCache', ->
       it 'compiles the file with babel and caches it', ->
         CompileCache.addPathToCache(path.join(fixtures, 'babel', 'babel-comment.js'), atomHome)
         expect(CompileCache.getCacheStats()['.js']).toEqual {hits: 0, misses: 1}
-        expect(Babel.transform.callCount).toBe 1
+        expect(babelCompiler.compile.callCount).toBe 1
 
         CompileCache.addPathToCache(path.join(fixtures, 'babel', 'babel-comment.js'), atomHome)
         expect(CompileCache.getCacheStats()['.js']).toEqual {hits: 1, misses: 1}
-        expect(Babel.transform.callCount).toBe 1
+        expect(babelCompiler.compile.callCount).toBe 1
 
     describe 'when the given file is coffee-script', ->
       it 'compiles the file with coffee-script and caches it', ->

spec/compile-cache-spec.coffee

@@ -1,4 +1,5 @@
 /** @babel */
+'not strict';
 
 import path from 'path';
 import childProcess from 'child_process';

spec/update-process-env-spec.js

@@ -0,0 +1,21 @@
+let presets = [
+  [
+    'babel-preset-atomic',
+    {
+      // transform ES modules to commonjs
+      keepModules: false,
+      // some of the packages use non-strict JavaScript in ES6 modules! We need to add this for now. Eventually, we should fix those packages and remove these:
+      notStrictDirectiveTriggers: ['use babel'],
+      notStrictCommentTriggers: ['@babel', '@flow', '* @babel', '* @flow']
+    }
+  ]
+];
+
+let plugins = [];
+
+module.exports = {
+  presets: presets,
+  plugins: plugins,
+  exclude: 'node_modules/**',
+  sourceMap: 'inline'
+};

src/babel.config.js

@@ -2,7 +2,8 @@
 
 const crypto = require('crypto');
 const path = require('path');
-const defaultOptions = require('../static/babelrc.json');
+const defaultOptions = require('./babel.config.js');
+const configFile = path.join(__dirname, './babel.config.js');
 
 let babel = null;
 let babelVersionDirectory = null;
@@ -31,7 +32,7 @@ exports.shouldCompile = function(sourceCode) {
 
 exports.getCachePath = function(sourceCode) {
   if (babelVersionDirectory == null) {
-    const babelVersion = require('babel-core/package.json').version;
+    const babelVersion = require('@babel/core/package.json').version;
     babelVersionDirectory = path.join(
       'js',
       'babel',
@@ -50,28 +51,22 @@ exports.getCachePath = function(sourceCode) {
 
 exports.compile = function(sourceCode, filePath) {
   if (!babel) {
-    babel = require('babel-core');
-    const Logger = require('babel-core/lib/transformation/file/logger');
-    const noop = function() {};
-    Logger.prototype.debug = noop;
-    Logger.prototype.verbose = noop;
+    babel = require('@babel/core');
   }
-
   if (process.platform === 'win32') {
     filePath = 'file:///' + path.resolve(filePath).replace(/\\/g, '/');
   }
 
-  const options = { filename: filePath };
-  for (const key in defaultOptions) {
-    options[key] = defaultOptions[key];
-  }
-  return babel.transform(sourceCode, options).code;
+  return babel.transformSync(sourceCode, {
+    filename: filePath,
+    configFile
+  }).code;
 };
 
 function createVersionAndOptionsDigest(version, options) {
   return crypto
     .createHash('sha1')
-    .update('babel-core', 'utf8')
+    .update('@babel/core', 'utf8')
     .update('\0', 'utf8')
     .update(version, 'utf8')
     .update('\0', 'utf8')