@parcel/transformer-babel 2.0.0-nightly.982 → 2.0.0-nightly.993

package/lib/BabelTransformer.js

@@ -5,15 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-function _babelAstUtils() {
-  const data = require("@parcel/babel-ast-utils");
-
-  _babelAstUtils = function () {
-    return data;
-  };
-
-  return data;
-}
+var _babelErrorUtils = require("./babelErrorUtils");
 
 function _plugin() {
   const data = require("@parcel/plugin");
@@ -55,16 +47,6 @@ function _semver() {
   return data;
 }
 
-function _generator() {
-  const data = _interopRequireDefault(require("@babel/generator"));
-
-  _generator = function () {
-    return data;
-  };
-
-  return data;
-}
-
 var _babel = _interopRequireDefault(require("./babel7"));
 
 var _config = require("./config");
@@ -111,7 +93,7 @@ var _default = new (_plugin().Transformer)({
 
       return [asset];
     } catch (e) {
-      throw await (0, _babelAstUtils().babelErrorEnhancer)(e, asset);
+      throw await (0, _babelErrorUtils.babelErrorEnhancer)(e, asset);
     }
   },
 
@@ -122,10 +104,18 @@ var _default = new (_plugin().Transformer)({
   }) {
     let originalSourceMap = await asset.getMap();
     let sourceFileName = (0, _utils().relativeUrl)(options.projectRoot, asset.filePath);
+    const babelCorePath = await options.packageManager.resolve('@babel/core', asset.filePath, {
+      range: '^7.12.0',
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall
+    });
+    const {
+      default: generate
+    } = await options.packageManager.require('@babel/generator', babelCorePath.resolved);
     let {
       code,
       rawMappings
-    } = (0, _generator().default)(ast.program, {
+    } = generate(ast.program, {
       sourceFileName,
       sourceMaps: !!asset.env.sourceMap,
       comments: true

package/lib/babel7.js

@@ -15,16 +15,6 @@ function _assert() {
   return data;
 }
 
-function internalBabelCore() {
-  const data = _interopRequireWildcard(require("@babel/core"));
-
-  internalBabelCore = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _utils() {
   const data = require("@parcel/utils");
 
@@ -35,22 +25,10 @@ function _utils() {
   return data;
 }
 
-function _babelAstUtils() {
-  const data = require("@parcel/babel-ast-utils");
-
-  _babelAstUtils = function () {
-    return data;
-  };
-
-  return data;
-}
+var _remapAstLocations = require("./remapAstLocations");
 
 var _package = _interopRequireDefault(require("../package.json"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const transformerVersion = _package.default.version;
@@ -65,7 +43,7 @@ async function babel7(opts) {
     babelOptions,
     additionalPlugins = []
   } = opts;
-  const babelCore = babelOptions.internal ? internalBabelCore() : await options.packageManager.require('@babel/core', asset.filePath, {
+  const babelCore = await options.packageManager.require('@babel/core', asset.filePath, {
     range: '^7.12.0',
     saveDev: true,
     shouldAutoInstall: options.shouldAutoInstall
@@ -105,7 +83,7 @@ async function babel7(opts) {
       let map = await asset.getMap();
 
       if (map) {
-        (0, _babelAstUtils().remapAstLocations)(res.ast, map);
+        (0, _remapAstLocations.remapAstLocations)(babelCore.types, res.ast, map);
       }
     }
   }

package/lib/babelErrorUtils.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.babelErrorEnhancer = babelErrorEnhancer;
+
+async function babelErrorEnhancer(error, asset) {
+  if (error.loc) {
+    let start = error.message.startsWith(asset.filePath) ? asset.filePath.length + 1 : 0;
+    error.message = error.message.slice(start).split('\n')[0].trim();
+  }
+
+  error.source = await asset.getCode();
+  error.filePath = asset.filePath;
+  return error;
+}

package/lib/config.js

@@ -25,16 +25,6 @@ function _path() {
   return data;
 }
 
-function internalBabelCore() {
-  const data = _interopRequireWildcard(require("@babel/core"));
-
-  internalBabelCore = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _utils() {
   const data = require("@parcel/utils");
 
@@ -55,25 +45,19 @@ function _diagnostic() {
   return data;
 }
 
+var _constants = require("./constants");
+
 var _jsx = _interopRequireDefault(require("./jsx"));
 
 var _flow = _interopRequireDefault(require("./flow"));
 
 var _utils2 = require("./utils");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const TYPESCRIPT_EXTNAME_RE = /\.tsx?$/;
-
-const BABEL_TRANSFORMER_DIR = _path().default.dirname(__dirname);
-
 const JS_EXTNAME_RE = /^\.(js|cjs|mjs)$/;
 const BABEL_CONFIG_FILENAMES = ['.babelrc', '.babelrc.js', '.babelrc.json', '.babelrc.cjs', '.babelrc.mjs', '.babelignore', 'babel.config.js', 'babel.config.json', 'babel.config.mjs', 'babel.config.cjs'];
-const BABEL_CORE_RANGE = '^7.12.0';
 
 async function load(config, options, logger) {
   var _ref, _ref2, _options$env$BABEL_EN;
@@ -98,14 +82,14 @@ async function load(config, options, logger) {
   }
 
   const babelCore = await options.packageManager.require('@babel/core', config.searchPath, {
-    range: BABEL_CORE_RANGE,
+    range: _constants.BABEL_CORE_RANGE,
     saveDev: true,
     shouldAutoInstall: options.shouldAutoInstall
   });
   config.addDevDependency({
     specifier: '@babel/core',
     resolveFrom: config.searchPath,
-    range: BABEL_CORE_RANGE
+    range: _constants.BABEL_CORE_RANGE
   });
   config.invalidateOnEnvChange('BABEL_ENV');
   config.invalidateOnEnvChange('NODE_ENV');
@@ -134,7 +118,7 @@ async function load(config, options, logger) {
         additionalInvalidations: [{
           specifier: '@babel/core',
           resolveFrom: config.searchPath,
-          range: BABEL_CORE_RANGE
+          range: _constants.BABEL_CORE_RANGE
         }]
       });
     } else {
@@ -234,14 +218,6 @@ async function buildDefaultBabelConfig(options, config) {
     syntaxPlugins.push('jsx');
   }
 
-  babelOptions.presets = (babelOptions.presets || []).map(preset => internalBabelCore().createConfigItem(preset, {
-    type: 'preset',
-    dirname: BABEL_TRANSFORMER_DIR
-  }));
-  babelOptions.plugins = (babelOptions.plugins || []).map(plugin => internalBabelCore().createConfigItem(plugin, {
-    type: 'plugin',
-    dirname: BABEL_TRANSFORMER_DIR
-  }));
   definePluginDependencies(config, babelOptions, options);
   return {
     internal: true,
@@ -274,7 +250,7 @@ function definePluginDependencies(config, babelConfig, options) {
       additionalInvalidations: [{
         specifier: '@babel/core',
         resolveFrom: config.searchPath,
-        range: BABEL_CORE_RANGE
+        range: _constants.BABEL_CORE_RANGE
       }]
     });
   }

package/lib/constants.js

@@ -3,6 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BABEL_RANGE = void 0;
-const BABEL_RANGE = '^7.0.0';
-exports.BABEL_RANGE = BABEL_RANGE;
+exports.BABEL_CORE_RANGE = void 0;
+const BABEL_CORE_RANGE = '^7.12.0';
+exports.BABEL_CORE_RANGE = BABEL_CORE_RANGE;

package/lib/flow.js

@@ -5,6 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = getFlowOptions;
 
+var _constants = require("./constants");
+
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
  * Generates a babel config for stripping away Flow types.
  */
@@ -21,9 +35,22 @@ async function getFlowOptions(config, options) {
     return null;
   }
 
+  const babelCore = await options.packageManager.require('@babel/core', config.searchPath, {
+    range: _constants.BABEL_CORE_RANGE,
+    saveDev: true,
+    shouldAutoInstall: options.shouldAutoInstall
+  });
+  await options.packageManager.require('@babel/plugin-transform-flow-strip-types', config.searchPath, {
+    range: '^7.0.0',
+    saveDev: true,
+    shouldAutoInstall: options.shouldAutoInstall
+  });
   return {
-    plugins: [['@babel/plugin-transform-flow-strip-types', {
+    plugins: [babelCore.createConfigItem(['@babel/plugin-transform-flow-strip-types', {
       requireDirective: true
-    }]]
+    }], {
+      type: 'plugin',
+      dirname: _path().default.dirname(config.searchPath)
+    })]
   };
 }

package/lib/remapAstLocations.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.remapAstLocations = remapAstLocations;
+
+function remapAstLocations(t, ast, map) {
+  // remap ast to original mappings
+  // This improves sourcemap accuracy and fixes sourcemaps when scope-hoisting
+  traverseAll(t, ast.program, node => {
+    if (node.loc) {
+      var _node$loc;
+
+      if ((_node$loc = node.loc) !== null && _node$loc !== void 0 && _node$loc.start) {
+        let mapping = map.findClosestMapping(node.loc.start.line, node.loc.start.column);
+
+        if (mapping !== null && mapping !== void 0 && mapping.original) {
+          // $FlowFixMe
+          node.loc.start.line = mapping.original.line; // $FlowFixMe
+
+          node.loc.start.column = mapping.original.column; // $FlowFixMe
+
+          let length = node.loc.end.column - node.loc.start.column; // $FlowFixMe
+
+          node.loc.end.line = mapping.original.line; // $FlowFixMe
+
+          node.loc.end.column = mapping.original.column + length; // $FlowFixMe
+
+          node.loc.filename = mapping.source;
+        } else {
+          // Maintain null mappings?
+          node.loc = null;
+        }
+      }
+    }
+  });
+}
+
+function traverseAll(t, node, visitor) {
+  if (!node) {
+    return;
+  }
+
+  visitor(node);
+
+  for (let key of t.VISITOR_KEYS[node.type] || []) {
+    // $FlowFixMe
+    let subNode = node[key];
+
+    if (Array.isArray(subNode)) {
+      for (let i = 0; i < subNode.length; i++) {
+        traverseAll(t, subNode[i], visitor);
+      }
+    } else {
+      traverseAll(t, subNode, visitor);
+    }
+  }
+}

package/lib/utils.js

@@ -25,20 +25,25 @@ function _semver() {
   return data;
 }
 
-function _options() {
-  const data = require("@babel/helper-compilation-targets/lib/options");
-
-  _options = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// List of browsers to exclude when the esmodule target is specified.
+// Copied from @babel/helper-compilation-targets/lib/options.js
+const TargetNames = {
+  node: 'node',
+  chrome: 'chrome',
+  opera: 'opera',
+  edge: 'edge',
+  firefox: 'firefox',
+  safari: 'safari',
+  ie: 'ie',
+  ios: 'ios',
+  android: 'android',
+  electron: 'electron',
+  samsung: 'samsung',
+  rhino: 'rhino'
+}; // List of browsers to exclude when the esmodule target is specified.
 // Based on https://caniuse.com/#feat=es6-module
+
 const ESMODULE_BROWSERS = ['not ie <= 11', 'not edge < 16', 'not firefox < 60', 'not chrome < 61', 'not safari < 11', 'not opera < 48', 'not ios_saf < 11', 'not op_mini all', 'not android < 76', 'not blackberry > 0', 'not op_mob > 0', 'not and_chr < 76', 'not and_ff < 68', 'not ie_mob > 0', 'not and_uc > 0', 'not samsung < 8.2', 'not and_qq > 0', 'not baidu > 0', 'not kaios > 0'];
 
 function enginesToBabelTargets(env) {
@@ -58,7 +63,7 @@ function enginesToBabelTargets(env) {
       var _semver$minVersion;
 
       (0, _assert().default)(typeof engineValue === 'string');
-      if (!_options().TargetNames.hasOwnProperty(engineName)) continue;
+      if (!TargetNames.hasOwnProperty(engineName)) continue;
       let minVersion = (_semver$minVersion = _semver().default.minVersion(engineValue)) === null || _semver$minVersion === void 0 ? void 0 : _semver$minVersion.toString();
       targets[engineName] = minVersion !== null && minVersion !== void 0 ? minVersion : engineValue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-babel",
-  "version": "2.0.0-nightly.982+4745cd30",
+  "version": "2.0.0-nightly.993+90050e4e",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,29 +17,23 @@
   "source": "src/BabelTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "2.0.0-nightly.980+4745cd30"
+    "parcel": "2.0.0-nightly.991+90050e4e"
   },
   "dependencies": {
-    "@babel/core": "^7.12.0",
-    "@babel/generator": "^7.9.0",
-    "@babel/helper-compilation-targets": "^7.8.4",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/traverse": "^7.0.0",
-    "@parcel/babel-ast-utils": "2.2.1-nightly.2605+4745cd30",
-    "@parcel/diagnostic": "2.0.0-nightly.982+4745cd30",
-    "@parcel/plugin": "2.0.0-nightly.982+4745cd30",
+    "@parcel/diagnostic": "2.0.0-nightly.993+90050e4e",
+    "@parcel/plugin": "2.0.0-nightly.993+90050e4e",
     "@parcel/source-map": "^2.0.0",
-    "@parcel/utils": "2.0.0-nightly.982+4745cd30",
+    "@parcel/utils": "2.0.0-nightly.993+90050e4e",
     "browserslist": "^4.6.6",
-    "core-js": "^3.2.1",
-    "json5": "^2.1.0",
+    "json5": "^2.2.0",
     "nullthrows": "^1.1.1",
     "semver": "^5.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.0",
     "@babel/preset-env": "^7.0.0",
-    "@parcel/types": "2.0.0-nightly.982+4745cd30"
+    "@babel/types": "^7.12.0",
+    "@parcel/types": "2.0.0-nightly.993+90050e4e"
   },
-  "gitHead": "4745cd3023f8d5a5adcf9e565d5b82d1418dc262"
+  "gitHead": "90050e4e6a1a99454b414509a00aa7fccd7f7b70"
 }

package/src/BabelTransformer.js

@@ -1,11 +1,10 @@
 // @flow strict-local
 
-import {babelErrorEnhancer} from '@parcel/babel-ast-utils';
+import {babelErrorEnhancer} from './babelErrorUtils';
 import {Transformer} from '@parcel/plugin';
 import {relativeUrl} from '@parcel/utils';
 import SourceMap from '@parcel/source-map';
 import semver from 'semver';
-import generate from '@babel/generator';
 import babel7 from './babel7';
 import {load} from './config';
 
@@ -48,6 +47,22 @@ export default (new Transformer({
       options.projectRoot,
       asset.filePath,
     );
+
+    const babelCorePath = await options.packageManager.resolve(
+      '@babel/core',
+      asset.filePath,
+      {
+        range: '^7.12.0',
+        saveDev: true,
+        shouldAutoInstall: options.shouldAutoInstall,
+      },
+    );
+
+    const {default: generate} = await options.packageManager.require(
+      '@babel/generator',
+      babelCorePath.resolved,
+    );
+
     let {code, rawMappings} = generate(ast.program, {
       sourceFileName,
       sourceMaps: !!asset.env.sourceMap,

package/src/babel7.js

@@ -1,11 +1,11 @@
 // @flow
 
 import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
+import typeof * as BabelCore from '@babel/core';
 
 import invariant from 'assert';
-import * as internalBabelCore from '@babel/core';
 import {relativeUrl} from '@parcel/utils';
-import {remapAstLocations} from '@parcel/babel-ast-utils';
+import {remapAstLocations} from './remapAstLocations';
 
 import packageJson from '../package.json';
 
@@ -23,13 +23,15 @@ export default async function babel7(
   opts: Babel7TransformOptions,
 ): Promise<?AST> {
   let {asset, options, babelOptions, additionalPlugins = []} = opts;
-  const babelCore = babelOptions.internal
-    ? internalBabelCore
-    : await options.packageManager.require('@babel/core', asset.filePath, {
-        range: '^7.12.0',
-        saveDev: true,
-        shouldAutoInstall: options.shouldAutoInstall,
-      });
+  const babelCore: BabelCore = await options.packageManager.require(
+    '@babel/core',
+    asset.filePath,
+    {
+      range: '^7.12.0',
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall,
+    },
+  );
 
   let config = {
     ...babelOptions.config,
@@ -77,7 +79,7 @@ export default async function babel7(
     if (res.ast) {
       let map = await asset.getMap();
       if (map) {
-        remapAstLocations(res.ast, map);
+        remapAstLocations(babelCore.types, res.ast, map);
       }
     }
   }

package/src/babelErrorUtils.js

@@ -0,0 +1,30 @@
+// @flow
+import type {BaseAsset} from '@parcel/types';
+
+export type BabelError = Error & {
+  loc?: {
+    line: number,
+    column: number,
+    ...
+  },
+  source?: string,
+  filePath?: string,
+  ...
+};
+
+export async function babelErrorEnhancer(
+  error: BabelError,
+  asset: BaseAsset,
+): Promise<BabelError> {
+  if (error.loc) {
+    let start = error.message.startsWith(asset.filePath)
+      ? asset.filePath.length + 1
+      : 0;
+    error.message = error.message.slice(start).split('\n')[0].trim();
+  }
+
+  error.source = await asset.getCode();
+  error.filePath = asset.filePath;
+
+  return error;
+}

package/src/config.js

@@ -7,16 +7,15 @@ import type {BabelConfig} from './types';
 
 import json5 from 'json5';
 import path from 'path';
-import * as internalBabelCore from '@babel/core';
 import {hashObject, relativePath, resolveConfig} from '@parcel/utils';
 import {md, generateJSONCodeHighlights} from '@parcel/diagnostic';
+import {BABEL_CORE_RANGE} from './constants';
 
 import isJSX from './jsx';
 import getFlowOptions from './flow';
 import {enginesToBabelTargets} from './utils';
 
 const TYPESCRIPT_EXTNAME_RE = /\.tsx?$/;
-const BABEL_TRANSFORMER_DIR = path.dirname(__dirname);
 const JS_EXTNAME_RE = /^\.(js|cjs|mjs)$/;
 const BABEL_CONFIG_FILENAMES = [
   '.babelrc',
@@ -31,8 +30,6 @@ const BABEL_CONFIG_FILENAMES = [
   'babel.config.cjs',
 ];
 
-const BABEL_CORE_RANGE = '^7.12.0';
-
 type BabelConfigResult = {|
   internal: boolean,
   config: BabelConfig,
@@ -234,19 +231,6 @@ async function buildDefaultBabelConfig(
     syntaxPlugins.push('jsx');
   }
 
-  babelOptions.presets = (babelOptions.presets || []).map(preset =>
-    internalBabelCore.createConfigItem(preset, {
-      type: 'preset',
-      dirname: BABEL_TRANSFORMER_DIR,
-    }),
-  );
-  babelOptions.plugins = (babelOptions.plugins || []).map(plugin =>
-    internalBabelCore.createConfigItem(plugin, {
-      type: 'plugin',
-      dirname: BABEL_TRANSFORMER_DIR,
-    }),
-  );
-
   definePluginDependencies(config, babelOptions, options);
   return {
     internal: true,

package/src/constants.js

@@ -1,3 +1,3 @@
 // @flow strict-local
 
-export const BABEL_RANGE = '^7.0.0';
+export const BABEL_CORE_RANGE = '^7.12.0';

package/src/flow.js

@@ -2,6 +2,10 @@
 
 import type {Config, PluginOptions, PackageJSON} from '@parcel/types';
 import type {BabelConfig} from './types';
+import typeof * as BabelCore from '@babel/core';
+
+import {BABEL_CORE_RANGE} from './constants';
+import path from 'path';
 
 /**
  * Generates a babel config for stripping away Flow types.
@@ -28,9 +32,35 @@ export default async function getFlowOptions(
     return null;
   }
 
+  const babelCore: BabelCore = await options.packageManager.require(
+    '@babel/core',
+    config.searchPath,
+    {
+      range: BABEL_CORE_RANGE,
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall,
+    },
+  );
+
+  await options.packageManager.require(
+    '@babel/plugin-transform-flow-strip-types',
+    config.searchPath,
+    {
+      range: '^7.0.0',
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall,
+    },
+  );
+
   return {
     plugins: [
-      ['@babel/plugin-transform-flow-strip-types', {requireDirective: true}],
+      babelCore.createConfigItem(
+        ['@babel/plugin-transform-flow-strip-types', {requireDirective: true}],
+        {
+          type: 'plugin',
+          dirname: path.dirname(config.searchPath),
+        },
+      ),
     ],
   };
 }

package/src/remapAstLocations.js

@@ -0,0 +1,70 @@
+// @flow strict-local
+
+import type {File as BabelNodeFile} from '@babel/types';
+import type SourceMap from '@parcel/source-map';
+import type {Node} from '@babel/types';
+import typeof * as BabelTypes from '@babel/types';
+
+export function remapAstLocations(
+  t: BabelTypes,
+  ast: BabelNodeFile,
+  map: SourceMap,
+) {
+  // remap ast to original mappings
+  // This improves sourcemap accuracy and fixes sourcemaps when scope-hoisting
+  traverseAll(t, ast.program, node => {
+    if (node.loc) {
+      if (node.loc?.start) {
+        let mapping = map.findClosestMapping(
+          node.loc.start.line,
+          node.loc.start.column,
+        );
+
+        if (mapping?.original) {
+          // $FlowFixMe
+          node.loc.start.line = mapping.original.line;
+          // $FlowFixMe
+          node.loc.start.column = mapping.original.column;
+
+          // $FlowFixMe
+          let length = node.loc.end.column - node.loc.start.column;
+
+          // $FlowFixMe
+          node.loc.end.line = mapping.original.line;
+          // $FlowFixMe
+          node.loc.end.column = mapping.original.column + length;
+
+          // $FlowFixMe
+          node.loc.filename = mapping.source;
+        } else {
+          // Maintain null mappings?
+          node.loc = null;
+        }
+      }
+    }
+  });
+}
+
+function traverseAll(
+  t: BabelTypes,
+  node: Node,
+  visitor: (node: Node) => void,
+): void {
+  if (!node) {
+    return;
+  }
+
+  visitor(node);
+
+  for (let key of t.VISITOR_KEYS[node.type] || []) {
+    // $FlowFixMe
+    let subNode: Node | Array<Node> = node[key];
+    if (Array.isArray(subNode)) {
+      for (let i = 0; i < subNode.length; i++) {
+        traverseAll(t, subNode[i], visitor);
+      }
+    } else {
+      traverseAll(t, subNode, visitor);
+    }
+  }
+}

package/src/utils.js

@@ -5,7 +5,22 @@ import type {Targets as BabelTargets} from '@babel/preset-env';
 
 import invariant from 'assert';
 import semver from 'semver';
-import {TargetNames} from '@babel/helper-compilation-targets/lib/options';
+
+// Copied from @babel/helper-compilation-targets/lib/options.js
+const TargetNames = {
+  node: 'node',
+  chrome: 'chrome',
+  opera: 'opera',
+  edge: 'edge',
+  firefox: 'firefox',
+  safari: 'safari',
+  ie: 'ie',
+  ios: 'ios',
+  android: 'android',
+  electron: 'electron',
+  samsung: 'samsung',
+  rhino: 'rhino',
+};
 
 // List of browsers to exclude when the esmodule target is specified.
 // Based on https://caniuse.com/#feat=es6-module

package/lib/astConverter.js

@@ -1,114 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.babel7toBabel6 = babel7toBabel6;
-exports.babel6toBabel7 = babel6toBabel7;
-
-function _traverse() {
-  const data = _interopRequireDefault(require("@babel/traverse"));
-
-  _traverse = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Convert between babel 7 and babel 6 AST
-// More info on the AST Changes: https://babeljs.io/docs/en/v7-migration-api#ast-changes
-function babel7toBabel6(ast) {
-  const visitor = {
-    ArrowFunctionExpression: node => {
-      node.expression = node.body.type !== 'BlockStatement';
-    },
-    ExistsTypeAnnotation: node => {
-      node.type = 'ExistentialTypeParam';
-    },
-    NumberLiteralTypeAnnotation: node => {
-      node.type = 'NumericLiteralTypeAnnotation';
-    },
-    ObjectTypeIndexer: node => {
-      node.end++;
-      node.loc.end.column++;
-    },
-    ForOfStatement: node => {
-      node.type = 'ForAwaitStatement';
-      delete node.await;
-    },
-    SpreadElement: (node, path) => {
-      if (path.parentPath.isObjectExpression() || path.parentPath.isArrayExpression()) {
-        node.type = 'SpreadProperty';
-      }
-    },
-    RestElement: (node, path) => {
-      if (path.parentPath.isObjectPattern() || path.parentPath.isArrayPattern()) {
-        node.type = 'RestProperty';
-      }
-    }
-  };
-  (0, _traverse().default)(ast, {
-    enter(path) {
-      if (path.node.variance && path.node.variance.type === 'Variance') {
-        path.node.variance = path.node.variance.kind;
-      }
-
-      let visitorFunc = visitor[path.node.type];
-
-      if (visitorFunc) {
-        visitorFunc(path.node, path);
-      }
-    }
-
-  });
-  return ast;
-}
-
-function babel6toBabel7(ast) {
-  const visitor = {
-    ArrowFunctionExpression: node => {
-      delete node.expression;
-    },
-    ExistentialTypeParam: node => {
-      node.type = 'ExistsTypeAnnotation';
-    },
-    NumericLiteralTypeAnnotation: node => {
-      node.type = 'NumberLiteralTypeAnnotation';
-    },
-    ObjectTypeIndexer: node => {
-      node.end--;
-      node.loc.end.column--;
-    },
-    ForAwaitStatement: node => {
-      node.type = 'ForOfStatement';
-      node.await = true;
-    },
-    SpreadProperty: node => {
-      node.type = 'SpreadElement';
-    },
-    RestProperty: node => {
-      node.type = 'RestElement';
-    }
-  };
-  (0, _traverse().default)(ast, {
-    enter(path) {
-      if (path.node.variance && typeof path.node.variance === 'string') {
-        path.node.variance = {
-          type: 'VarianceNode',
-          kind: path.node.variance
-        };
-      }
-
-      let visitorFunc = visitor[path.node.type];
-
-      if (visitorFunc) {
-        visitorFunc(path.node);
-      }
-    }
-
-  });
-  return ast;
-}

package/src/astConverter.js

@@ -1,102 +0,0 @@
-import traverse from '@babel/traverse';
-
-// Convert between babel 7 and babel 6 AST
-// More info on the AST Changes: https://babeljs.io/docs/en/v7-migration-api#ast-changes
-export function babel7toBabel6(ast) {
-  const visitor = {
-    ArrowFunctionExpression: node => {
-      node.expression = node.body.type !== 'BlockStatement';
-    },
-    ExistsTypeAnnotation: node => {
-      node.type = 'ExistentialTypeParam';
-    },
-    NumberLiteralTypeAnnotation: node => {
-      node.type = 'NumericLiteralTypeAnnotation';
-    },
-    ObjectTypeIndexer: node => {
-      node.end++;
-      node.loc.end.column++;
-    },
-    ForOfStatement: node => {
-      node.type = 'ForAwaitStatement';
-      delete node.await;
-    },
-    SpreadElement: (node, path) => {
-      if (
-        path.parentPath.isObjectExpression() ||
-        path.parentPath.isArrayExpression()
-      ) {
-        node.type = 'SpreadProperty';
-      }
-    },
-    RestElement: (node, path) => {
-      if (
-        path.parentPath.isObjectPattern() ||
-        path.parentPath.isArrayPattern()
-      ) {
-        node.type = 'RestProperty';
-      }
-    },
-  };
-
-  traverse(ast, {
-    enter(path) {
-      if (path.node.variance && path.node.variance.type === 'Variance') {
-        path.node.variance = path.node.variance.kind;
-      }
-
-      let visitorFunc = visitor[path.node.type];
-      if (visitorFunc) {
-        visitorFunc(path.node, path);
-      }
-    },
-  });
-
-  return ast;
-}
-
-export function babel6toBabel7(ast) {
-  const visitor = {
-    ArrowFunctionExpression: node => {
-      delete node.expression;
-    },
-    ExistentialTypeParam: node => {
-      node.type = 'ExistsTypeAnnotation';
-    },
-    NumericLiteralTypeAnnotation: node => {
-      node.type = 'NumberLiteralTypeAnnotation';
-    },
-    ObjectTypeIndexer: node => {
-      node.end--;
-      node.loc.end.column--;
-    },
-    ForAwaitStatement: node => {
-      node.type = 'ForOfStatement';
-      node.await = true;
-    },
-    SpreadProperty: node => {
-      node.type = 'SpreadElement';
-    },
-    RestProperty: node => {
-      node.type = 'RestElement';
-    },
-  };
-
-  traverse(ast, {
-    enter(path) {
-      if (path.node.variance && typeof path.node.variance === 'string') {
-        path.node.variance = {
-          type: 'VarianceNode',
-          kind: path.node.variance,
-        };
-      }
-
-      let visitorFunc = visitor[path.node.type];
-      if (visitorFunc) {
-        visitorFunc(path.node);
-      }
-    },
-  });
-
-  return ast;
-}