@parcel/transformer-babel 2.0.0-beta.2 → 2.0.0-nightly.1004

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");
@@ -25,45 +17,49 @@ function _plugin() {
   return data;
 }
 
-function _semver() {
-  const data = _interopRequireDefault(require("semver"));
+function _utils() {
+  const data = require("@parcel/utils");
 
-  _semver = function () {
+  _utils = function () {
     return data;
   };
 
   return data;
 }
 
-function _babel() {
-  const data = _interopRequireDefault(require("./babel7"));
+function _sourceMap() {
+  const data = _interopRequireDefault(require("@parcel/source-map"));
 
-  _babel = function () {
+  _sourceMap = function () {
     return data;
   };
 
   return data;
 }
 
-function _config() {
-  const data = require("./config");
+function _semver() {
+  const data = _interopRequireDefault(require("semver"));
 
-  _config = function () {
+  _semver = function () {
     return data;
   };
 
   return data;
 }
 
+var _babel = _interopRequireDefault(require("./babel7"));
+
+var _config = require("./config");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = new (_plugin().Transformer)({
-  async loadConfig({
+  loadConfig({
     config,
     options,
     logger
   }) {
-    await (0, _config().load)(config, options, logger);
+    return (0, _config.load)(config, options, logger);
   },
 
   canReuseAST({
@@ -77,35 +73,77 @@ var _default = new (_plugin().Transformer)({
     config,
     options
   }) {
-    // TODO: Provide invalidateOnEnvChange on config?
-    asset.invalidateOnEnvChange('BABEL_ENV');
-    asset.invalidateOnEnvChange('NODE_ENV'); // TODO: come up with a better name
-
     try {
       if (config !== null && config !== void 0 && config.config) {
         if (asset.meta.babelPlugins != null && Array.isArray(asset.meta.babelPlugins)) {
-          await (0, _babel().default)(asset, options, config, asset.meta.babelPlugins);
+          await (0, _babel.default)({
+            asset,
+            options,
+            babelOptions: config,
+            additionalPlugins: asset.meta.babelPlugins
+          });
         } else {
-          await (0, _babel().default)(asset, options, config);
+          await (0, _babel.default)({
+            asset,
+            options,
+            babelOptions: config
+          });
         }
       }
 
       return [asset];
     } catch (e) {
-      throw await (0, _babelAstUtils().babelErrorEnhancer)(e, asset);
+      throw await (0, _babelErrorUtils.babelErrorEnhancer)(e, asset);
     }
   },
 
-  generate({
+  async generate({
     asset,
     ast,
     options
   }) {
-    return (0, _babelAstUtils().generate)({
-      asset,
-      ast,
-      options
+    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
+    } = generate(ast.program, {
+      sourceFileName,
+      sourceMaps: !!asset.env.sourceMap,
+      comments: true
     });
+    let map = new (_sourceMap().default)(options.projectRoot);
+
+    if (rawMappings) {
+      map.addIndexedMappings(rawMappings);
+    }
+
+    if (originalSourceMap) {
+      // The babel AST already contains the correct mappings, but not the source contents.
+      // We need to copy over the source contents from the original map.
+      let sourcesContent = originalSourceMap.getSourcesContentMap();
+
+      for (let filePath in sourcesContent) {
+        let content = sourcesContent[filePath];
+
+        if (content != null) {
+          map.setSourceContent(filePath, content);
+        }
+      }
+    }
+
+    return {
+      content: code,
+      map
+    };
   }
 
 });

package/lib/babel7.js

@@ -15,16 +15,6 @@ function _assert() {
   return data;
 }
 
-function babel() {
-  const data = _interopRequireWildcard(require("@babel/core"));
-
-  babel = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _utils() {
   const data = require("@parcel/utils");
 
@@ -35,27 +25,29 @@ function _utils() {
   return data;
 }
 
-function _package() {
-  const data = _interopRequireDefault(require("../package.json"));
-
-  _package = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+var _remapAstLocations = require("./remapAstLocations");
 
-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; }
+var _package = _interopRequireDefault(require("../package.json"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const transformerVersion = _package().default.version;
-
+const transformerVersion = _package.default.version;
 (0, _assert().default)(typeof transformerVersion === 'string');
 
-async function babel7(asset, options, babelOptions, additionalPlugins = []) {
+async function babel7(opts) {
+  var _babelOptions$config$, _babelOptions$config$2, _babelOptions$syntaxP;
+
+  let {
+    asset,
+    options,
+    babelOptions,
+    additionalPlugins = []
+  } = opts;
+  const babelCore = await options.packageManager.require('@babel/core', asset.filePath, {
+    range: '^7.12.0',
+    saveDev: true,
+    shouldAutoInstall: options.shouldAutoInstall
+  });
   let config = { ...babelOptions.config,
     plugins: additionalPlugins.concat(babelOptions.config.plugins),
     code: false,
@@ -67,7 +59,10 @@ async function babel7(asset, options, babelOptions, additionalPlugins = []) {
       sourceFilename: (0, _utils().relativeUrl)(options.projectRoot, asset.filePath),
       allowReturnOutsideFunction: true,
       strictMode: false,
-      sourceType: 'module'
+      sourceType: 'module',
+      plugins: [...((_babelOptions$config$ = (_babelOptions$config$2 = babelOptions.config.parserOpts) === null || _babelOptions$config$2 === void 0 ? void 0 : _babelOptions$config$2.plugins) !== null && _babelOptions$config$ !== void 0 ? _babelOptions$config$ : []), ...((_babelOptions$syntaxP = babelOptions.syntaxPlugins) !== null && _babelOptions$syntaxP !== void 0 ? _babelOptions$syntaxP : []), // Applied by preset-env
+      'classProperties', 'classPrivateProperties', 'classPrivateMethods', 'exportDefaultFrom' // 'topLevelAwait'
+      ]
     },
     caller: {
       name: 'parcel',
@@ -80,9 +75,17 @@ async function babel7(asset, options, babelOptions, additionalPlugins = []) {
   let res;
 
   if (ast) {
-    res = await babel().transformFromAstAsync(ast.program, asset.isASTDirty() ? undefined : await asset.getCode(), config);
+    res = await babelCore.transformFromAstAsync(ast.program, asset.isASTDirty() ? undefined : await asset.getCode(), config);
   } else {
-    res = await babel().transformAsync(await asset.getCode(), config);
+    res = await babelCore.transformAsync(await asset.getCode(), config);
+
+    if (res.ast) {
+      let map = await asset.getMap();
+
+      if (map) {
+        (0, _remapAstLocations.remapAstLocations)(babelCore.types, res.ast, map);
+      }
+    }
   }
 
   if (res.ast) {

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;
+}