@parcel/transformer-babel 2.0.0-beta.3.1 → 2.0.0-dev.1510

package/lib/BabelTransformer.js

@@ -4,137 +4,84 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@parcel/utils");
-
   _utils = function () {
     return data;
   };
-
   return data;
 }
-
 function _sourceMap() {
   const data = _interopRequireDefault(require("@parcel/source-map"));
-
   _sourceMap = function () {
     return data;
   };
-
   return data;
 }
-
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
-
   _semver = function () {
     return data;
   };
-
   return data;
 }
-
-function _generator() {
-  const data = _interopRequireDefault(require("@babel/generator"));
-
-  _generator = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _babel() {
-  const data = _interopRequireDefault(require("./babel7"));
-
-  _babel = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _config() {
-  const data = require("./config");
-
-  _config = 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({
+var _default = exports.default = new (_plugin().Transformer)({
+  loadConfig({
     config,
     options,
     logger
   }) {
-    await (0, _config().load)(config, options, logger);
+    return (0, _config.load)(config, options, logger);
   },
-
   canReuseAST({
     ast
   }) {
     return ast.type === 'babel' && _semver().default.satisfies(ast.version, '^7.0.0');
   },
-
   async transform({
     asset,
     config,
-    options
+    logger,
+    options,
+    tracer
   }) {
-    // 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)({
+          await (0, _babel.default)({
             asset,
             options,
+            logger,
             babelOptions: config,
-            additionalPlugins: asset.meta.babelPlugins
+            additionalPlugins: asset.meta.babelPlugins,
+            tracer
           });
         } else {
-          await (0, _babel().default)({
+          await (0, _babel.default)({
             asset,
             options,
-            babelOptions: config
+            logger,
+            babelOptions: config,
+            tracer
           });
         }
       }
-
       return [asset];
     } catch (e) {
-      throw await (0, _babelAstUtils().babelErrorEnhancer)(e, asset);
+      throw await (0, _babelErrorUtils.babelErrorEnhancer)(e, asset);
     }
   },
-
   async generate({
     asset,
     ast,
@@ -142,40 +89,40 @@ 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
     });
     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
     };
   }
-
-});
-
-exports.default = _default;
+});

package/lib/babel7.js

@@ -4,97 +4,74 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = babel7;
-
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _assert = function () {
     return data;
   };
-
-  return data;
-}
-
-function internalBabelCore() {
-  const data = _interopRequireWildcard(require("@babel/core"));
-
-  internalBabelCore = function () {
-    return data;
-  };
-
   return data;
 }
-
-function _utils() {
-  const data = require("@parcel/utils");
-
-  _utils = function () {
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
     return data;
   };
-
   return data;
 }
-
-function _babelAstUtils() {
-  const data = require("@parcel/babel-ast-utils");
-
-  _babelAstUtils = function () {
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
+  _diagnostic = function () {
     return data;
   };
-
   return data;
 }
-
-function _package() {
-  const data = _interopRequireDefault(require("../package.json"));
-
-  _package = function () {
+function _utils() {
+  const data = require("@parcel/utils");
+  _utils = function () {
     return data;
   };
-
   return data;
 }
-
-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; }
-
+var _remapAstLocations = require("./remapAstLocations");
+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(opts) {
   var _babelOptions$config$, _babelOptions$config$2, _babelOptions$syntaxP;
-
   let {
     asset,
     options,
     babelOptions,
-    additionalPlugins = []
+    additionalPlugins = [],
+    tracer
   } = 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
   });
-  let config = { ...babelOptions.config,
+  let config = {
+    ...babelOptions.config,
     plugins: additionalPlugins.concat(babelOptions.config.plugins),
     code: false,
     ast: true,
     filename: asset.filePath,
     babelrc: false,
     configFile: false,
-    parserOpts: { ...babelOptions.config.parserOpts,
+    parserOpts: {
+      ...babelOptions.config.parserOpts,
       sourceFilename: (0, _utils().relativeUrl)(options.projectRoot, asset.filePath),
       allowReturnOutsideFunction: true,
       strictMode: false,
       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'
+      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',
       version: transformerVersion,
@@ -102,23 +79,50 @@ async function babel7(opts) {
       outputFormat: asset.env.outputFormat
     }
   };
+  if (tracer.enabled) {
+    config.wrapPluginVisitorMethod = (key, nodeType, fn) => {
+      return function () {
+        let pluginKey = key;
+        if (pluginKey.startsWith(options.projectRoot)) {
+          pluginKey = _path().default.relative(options.projectRoot, pluginKey);
+        }
+        const measurement = tracer.createMeasurement(pluginKey, nodeType, _path().default.relative(options.projectRoot, asset.filePath));
+        fn.apply(this, arguments);
+        measurement && measurement.end();
+      };
+    };
+  }
   let ast = await asset.getAST();
   let res;
-
   if (ast) {
     res = await babelCore.transformFromAstAsync(ast.program, asset.isASTDirty() ? undefined : await asset.getCode(), config);
   } else {
     res = await babelCore.transformAsync(await asset.getCode(), config);
-
     if (res.ast) {
       let map = await asset.getMap();
-
       if (map) {
-        (0, _babelAstUtils().remapAstLocations)(res.ast, map);
+        (0, _remapAstLocations.remapAstLocations)(babelCore.types, res.ast, map);
+      }
+    }
+    if (res.externalDependencies) {
+      for (let f of res.externalDependencies) {
+        if (!_path().default.isAbsolute(f)) {
+          opts.logger.warn({
+            message: (0, _diagnostic().md)`Ignoring non-absolute Babel external dependency: ${f}`,
+            hints: ['Please report this to the corresponding Babel plugin and/or to Parcel.']
+          });
+        } else {
+          if (await options.inputFS.exists(f)) {
+            asset.invalidateOnFileChange(f);
+          } else {
+            asset.invalidateOnFileCreate({
+              filePath: f
+            });
+          }
+        }
       }
     }
   }
-
   if (res.ast) {
     asset.setAST({
       type: 'babel',

package/lib/babelErrorUtils.js

@@ -0,0 +1,15 @@
+"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;
+}