@parcel/transformer-babel 2.0.0-beta.3.1 → 2.0.0-nightly.1002

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,45 +47,19 @@ function _semver() {
   return data;
 }
 
-function _generator() {
-  const data = _interopRequireDefault(require("@babel/generator"));
-
-  _generator = function () {
-    return data;
-  };
+var _babel = _interopRequireDefault(require("./babel7"));
 
-  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 _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({
@@ -107,21 +73,17 @@ 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)({
+          await (0, _babel.default)({
             asset,
             options,
             babelOptions: config,
             additionalPlugins: asset.meta.babelPlugins
           });
         } else {
-          await (0, _babel().default)({
+          await (0, _babel.default)({
             asset,
             options,
             babelOptions: config
@@ -131,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);
     }
   },
 
@@ -142,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,34 +25,13 @@ function _utils() {
   return data;
 }
 
-function _babelAstUtils() {
-  const data = require("@parcel/babel-ast-utils");
-
-  _babelAstUtils = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _package() {
-  const data = _interopRequireDefault(require("../package.json"));
+var _remapAstLocations = require("./remapAstLocations");
 
-  _package = 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 _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) {
@@ -74,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
@@ -114,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

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.load = load;
 
-function _path() {
-  const data = _interopRequireDefault(require("path"));
+function _json() {
+  const data = _interopRequireDefault(require("json5"));
 
-  _path = function () {
+  _json = function () {
     return data;
   };
 
   return data;
 }
 
-function internalBabelCore() {
-  const data = _interopRequireWildcard(require("@babel/core"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-  internalBabelCore = function () {
+  _path = function () {
     return data;
   };
 
@@ -35,46 +35,27 @@ function _utils() {
   return data;
 }
 
-function _jsx() {
-  const data = _interopRequireDefault(require("./jsx"));
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
 
-  _jsx = function () {
+  _diagnostic = function () {
     return data;
   };
 
   return data;
 }
 
-function _flow() {
-  const data = _interopRequireDefault(require("./flow"));
+var _constants = require("./constants");
 
-  _flow = function () {
-    return data;
-  };
+var _jsx = _interopRequireDefault(require("./jsx"));
 
-  return data;
-}
+var _flow = _interopRequireDefault(require("./flow"));
 
-function _utils2() {
-  const data = require("./utils");
-
-  _utils2 = 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 _utils2 = require("./utils");
 
 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'];
 
@@ -97,19 +78,21 @@ async function load(config, options, logger) {
 
 
   if (!(await (0, _utils().resolveConfig)(options.inputFS, config.searchPath, BABEL_CONFIG_FILENAMES, options.projectRoot))) {
-    await buildDefaultBabelConfig(options, config);
-    return;
+    return buildDefaultBabelConfig(options, config);
   }
 
   const babelCore = await options.packageManager.require('@babel/core', config.searchPath, {
-    range: '^7.12.0',
+    range: _constants.BABEL_CORE_RANGE,
     saveDev: true,
     shouldAutoInstall: options.shouldAutoInstall
   });
   config.addDevDependency({
-    moduleSpecifier: '@babel/core',
-    resolveFrom: config.searchPath
+    specifier: '@babel/core',
+    resolveFrom: config.searchPath,
+    range: _constants.BABEL_CORE_RANGE
   });
+  config.invalidateOnEnvChange('BABEL_ENV');
+  config.invalidateOnEnvChange('NODE_ENV');
   let babelOptions = {
     filename: config.searchPath,
     cwd: options.projectRoot,
@@ -125,17 +108,21 @@ async function load(config, options, logger) {
       logger.warn({
         message: `It looks like you're using a JavaScript Babel config file. This means the config cannot be watched for changes, and Babel transformations cannot be cached. You'll need to restart Parcel for changes to this config to take effect. Try using a ${_path().default.basename(file, _path().default.extname(file)) + '.json'} file instead.`
       });
-      config.shouldInvalidateOnStartup(); // But also add the config as a dev dependency so we can at least attempt invalidation in watch mode.
+      config.invalidateOnStartup(); // But also add the config as a dev dependency so we can at least attempt invalidation in watch mode.
 
       config.addDevDependency({
-        moduleSpecifier: (0, _utils().relativePath)(options.projectRoot, file),
+        specifier: (0, _utils().relativePath)(options.projectRoot, file),
         resolveFrom: _path().default.join(options.projectRoot, 'index'),
-        // Also invalidate @parcel/transformer-babel when the config or a dependency updates.
+        // Also invalidate @babel/core when the config or a dependency updates.
         // This ensures that the caches in @babel/core are also invalidated.
-        invalidateParcelPlugin: true
+        additionalInvalidations: [{
+          specifier: '@babel/core',
+          resolveFrom: config.searchPath,
+          range: _constants.BABEL_CORE_RANGE
+        }]
       });
     } else {
-      config.addIncludedFile(file);
+      config.invalidateOnFileChange(file);
     }
   };
 
@@ -143,7 +130,7 @@ async function load(config, options, logger) {
     logger.warn({
       message: 'You are using an old version of @babel/core which does not support the necessary features for Parcel to cache and watch babel config files safely. You may need to restart Parcel for config changes to take effect. Please upgrade to @babel/core 7.12.0 or later to resolve this issue.'
     });
-    config.shouldInvalidateOnStartup();
+    config.invalidateOnStartup();
   }; // Old versions of @babel/core return null from loadPartialConfig when the file should explicitly not be run through babel (ignore/exclude)
 
 
@@ -182,30 +169,32 @@ async function load(config, options, logger) {
       if (config.searchPath.endsWith('.tsx')) {
         syntaxPlugins.push('jsx');
       }
-    } else if (await (0, _jsx().default)(options, config)) {
+    } else if (await (0, _jsx.default)(options, config)) {
       syntaxPlugins.push('jsx');
-    }
-
-    config.setResult({
-      internal: false,
-      config: partialConfig.options,
-      targets: (0, _utils2().enginesToBabelTargets)(config.env),
-      syntaxPlugins
-    }); // If the config has plugins loaded with require(), or inline plugins in the config,
+    } // If the config has plugins loaded with require(), or inline plugins in the config,
     // we can't cache the result of the compilation because we don't know where they came from.
 
+
     if (hasRequire(partialConfig.options)) {
       logger.warn({
         message: 'It looks like you are using `require` to configure Babel plugins or presets. This means Babel transformations cannot be cached and will run on each build. Please use strings to configure Babel instead.'
       });
-      config.setResultHash(JSON.stringify(Date.now()));
-      config.shouldInvalidateOnStartup();
+      config.setCacheKey(JSON.stringify(Date.now()));
+      config.invalidateOnStartup();
     } else {
-      definePluginDependencies(config, options);
-      config.setResultHash((0, _utils().md5FromObject)(partialConfig.options));
+      await warnOnRedundantPlugins(options.inputFS, partialConfig, logger);
+      definePluginDependencies(config, partialConfig.options, options);
+      config.setCacheKey((0, _utils().hashObject)(partialConfig.options));
     }
+
+    return {
+      internal: false,
+      config: partialConfig.options,
+      targets: (0, _utils2.enginesToBabelTargets)(config.env),
+      syntaxPlugins
+    };
   } else {
-    await buildDefaultBabelConfig(options, config);
+    return buildDefaultBabelConfig(options, config);
   }
 }
 
@@ -216,7 +205,7 @@ async function buildDefaultBabelConfig(options, config) {
   } // Detect flow. If not enabled, babel doesn't need to run at all.
 
 
-  let babelOptions = await (0, _flow().default)(config, options);
+  let babelOptions = await (0, _flow.default)(config, options);
 
   if (babelOptions == null) {
     return;
@@ -225,24 +214,16 @@ async function buildDefaultBabelConfig(options, config) {
 
   let syntaxPlugins = [];
 
-  if (await (0, _jsx().default)(options, config)) {
+  if (await (0, _jsx.default)(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
-  }));
-  config.setResult({
+  definePluginDependencies(config, babelOptions, options);
+  return {
     internal: true,
     config: babelOptions,
     syntaxPlugins
-  });
-  definePluginDependencies(config, options);
+  };
 }
 
 function hasRequire(options) {
@@ -250,25 +231,145 @@ function hasRequire(options) {
   return configItems.some(item => !item.file);
 }
 
-function definePluginDependencies(config, options) {
-  let babelConfig = config.result.config;
-
+function definePluginDependencies(config, babelConfig, options) {
   if (babelConfig == null) {
     return;
   }
 
-  let configItems = [...babelConfig.presets, ...babelConfig.plugins];
+  let configItems = [...(babelConfig.presets || []), ...(babelConfig.plugins || [])];
 
   for (let configItem of configItems) {
     // FIXME: this uses a relative path from the project root rather than resolving
     // from the config location because configItem.file.request can be a shorthand
     // rather than a full package name.
     config.addDevDependency({
-      moduleSpecifier: (0, _utils().relativePath)(options.projectRoot, configItem.file.resolved),
+      specifier: (0, _utils().relativePath)(options.projectRoot, configItem.file.resolved),
       resolveFrom: _path().default.join(options.projectRoot, 'index'),
-      // Also invalidate @parcel/transformer-babel when the plugin or a dependency updates.
+      // Also invalidate @babel/core when the plugin or a dependency updates.
       // This ensures that the caches in @babel/core are also invalidated.
-      invalidateParcelPlugin: true
+      additionalInvalidations: [{
+        specifier: '@babel/core',
+        resolveFrom: config.searchPath,
+        range: _constants.BABEL_CORE_RANGE
+      }]
+    });
+  }
+}
+
+const redundantPresets = new Set(['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript', '@parcel/babel-preset-env']);
+
+async function warnOnRedundantPlugins(fs, babelConfig, logger) {
+  var _babelConfig$config;
+
+  if (babelConfig == null) {
+    return;
+  }
+
+  let configPath = (_babelConfig$config = babelConfig.config) !== null && _babelConfig$config !== void 0 ? _babelConfig$config : babelConfig.babelrc;
+
+  if (!configPath) {
+    return;
+  }
+
+  let presets = babelConfig.options.presets || [];
+  let plugins = babelConfig.options.plugins || [];
+  let foundRedundantPresets = new Set();
+  let filteredPresets = presets.filter(preset => {
+    if (redundantPresets.has(preset.file.request)) {
+      foundRedundantPresets.add(preset.file.request);
+      return false;
+    }
+
+    return true;
+  });
+
+  let filePath = _path().default.relative(process.cwd(), configPath);
+
+  let diagnostics = [];
+
+  if (filteredPresets.length === 0 && foundRedundantPresets.size > 0 && plugins.length === 0) {
+    diagnostics.push({
+      message: (0, _diagnostic().md)`Parcel includes transpilation by default. Babel config __${filePath}__ contains only redundant presets. Deleting it may significantly improve build performance.`,
+      codeFrames: [{
+        filePath: configPath,
+        codeHighlights: await getCodeHighlights(fs, configPath, foundRedundantPresets)
+      }],
+      hints: [(0, _diagnostic().md)`Delete __${filePath}__`],
+      documentationURL: 'https://parceljs.org/languages/javascript/#default-presets'
+    });
+  } else if (foundRedundantPresets.size > 0) {
+    diagnostics.push({
+      message: (0, _diagnostic().md)`Parcel includes transpilation by default. Babel config __${filePath}__ includes the following redundant presets: ${[...foundRedundantPresets].map(p => _diagnostic().md.underline(p))}. Removing these may improve build performance.`,
+      codeFrames: [{
+        filePath: configPath,
+        codeHighlights: await getCodeHighlights(fs, configPath, foundRedundantPresets)
+      }],
+      hints: [(0, _diagnostic().md)`Remove the above presets from __${filePath}__`],
+      documentationURL: 'https://parceljs.org/languages/javascript/#default-presets'
     });
   }
+
+  if (foundRedundantPresets.has('@babel/preset-env')) {
+    var _babelConfig$config2, _babelConfig$config3;
+
+    diagnostics.push({
+      message: "@babel/preset-env does not support Parcel's targets, which will likely result in unnecessary transpilation and larger bundle sizes.",
+      codeFrames: [{
+        filePath: (_babelConfig$config2 = babelConfig.config) !== null && _babelConfig$config2 !== void 0 ? _babelConfig$config2 : babelConfig.babelrc,
+        codeHighlights: await getCodeHighlights(fs, (_babelConfig$config3 = babelConfig.config) !== null && _babelConfig$config3 !== void 0 ? _babelConfig$config3 : babelConfig.babelrc, new Set(['@babel/preset-env']))
+      }],
+      hints: [`Either remove __@babel/preset-env__ to use Parcel's builtin transpilation, or replace with __@parcel/babel-preset-env__`],
+      documentationURL: 'https://parceljs.org/languages/javascript/#custom-plugins'
+    });
+  }
+
+  if (diagnostics.length > 0) {
+    logger.warn(diagnostics);
+  }
+}
+
+async function getCodeHighlights(fs, filePath, redundantPresets) {
+  let ext = _path().default.extname(filePath);
+
+  if (ext !== '.js' && ext !== '.cjs' && ext !== '.mjs') {
+    let contents = await fs.readFile(filePath, 'utf8');
+
+    let json = _json().default.parse(contents);
+
+    let presets = json.presets || [];
+    let pointers = [];
+
+    for (let i = 0; i < presets.length; i++) {
+      if (Array.isArray(presets[i]) && redundantPresets.has(presets[i][0])) {
+        pointers.push({
+          type: 'value',
+          key: `/presets/${i}/0`
+        });
+      } else if (redundantPresets.has(presets[i])) {
+        pointers.push({
+          type: 'value',
+          key: `/presets/${i}`
+        });
+      }
+    }
+
+    if (pointers.length > 0) {
+      try {
+        return (0, _diagnostic().generateJSONCodeHighlights)(contents, pointers);
+      } catch {// TODO: support code highlights for json5 sources.
+        // Babel supports json5 syntax, but json-source-map does not.
+      }
+    }
+  }
+
+  return [{
+    start: {
+      line: 1,
+      column: 1
+    },
+    end: {
+      line: 1,
+      column: 1
+    }
+  }];
 }

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/jsx.js

@@ -40,6 +40,6 @@ async function isJSX(options, config) {
     return true;
   } else {
     // Find a dependency that implies JSX syntax.
-    return JSX_LIBRARIES.some(libName => pkg && (pkg.dependencies && pkg.dependencies[libName] || pkg.devDependencies && pkg.devDependencies[libName]));
+    return JSX_LIBRARIES.some(libName => pkg && (pkg.dependencies && pkg.dependencies[libName] || pkg.devDependencies && pkg.devDependencies[libName] || pkg.peerDependencies && pkg.peerDependencies[libName]));
   }
 }