@parcel/transformer-babel 2.0.0-nightly.97 → 2.1.0

package/src/flow.js

@@ -1,16 +1,33 @@
 // @flow
 
-import type {Config} from '@parcel/types';
+import type {Config, PluginOptions, PackageJSON} from '@parcel/types';
 import type {BabelConfig} from './types';
 
 /**
  * Generates a babel config for stripping away Flow types.
  */
-export default function getFlowOptions(config: Config): ?BabelConfig {
+export default async function getFlowOptions(
+  config: Config,
+  options: PluginOptions,
+): Promise<?BabelConfig> {
   if (!config.isSource) {
     return null;
   }
 
+  // Only add flow plugin if `flow-bin` is listed as a dependency in the root package.json
+  let conf = await config.getConfigFrom<PackageJSON>(
+    options.projectRoot + '/index',
+    ['package.json'],
+  );
+  let pkg = conf?.contents;
+  if (
+    !pkg ||
+    (!(pkg.dependencies && pkg.dependencies['flow-bin']) &&
+      !(pkg.devDependencies && pkg.devDependencies['flow-bin']))
+  ) {
+    return null;
+  }
+
   return {
     plugins: [
       ['@babel/plugin-transform-flow-strip-types', {requireDirective: true}],

package/src/jsx.js

@@ -1,55 +1,40 @@
-// @flow
-import type {Config} from '@parcel/types';
-import path from 'path';
+// @flow strict-local
+
+import type {Config, PluginOptions} from '@parcel/types';
 
-const JSX_EXTENSIONS = {
-  '.jsx': true,
-  '.tsx': true,
-};
+import path from 'path';
 
-const JSX_PRAGMA = {
-  react: {
-    pragma: 'React.createElement',
-    pragmaFrag: 'React.Fragment',
-  },
-  preact: {
-    pragma: 'h',
-    pragmaFrag: 'Fragment',
-  },
-  nervjs: {
-    pragma: 'Nerv.createElement',
-    pragmaFrag: undefined,
-  },
-  hyperapp: {
-    pragma: 'h',
-    pragmaFrag: undefined,
-  },
-};
+const JSX_EXTENSIONS = new Set(['.jsx', '.tsx']);
+const JSX_LIBRARIES = ['react', 'preact', 'nervejs', 'hyperapp'];
 
 /**
- * Generates a babel config for JSX. Attempts to detect react or react-like libraries
- * and changes the pragma accordingly.
+ * Returns whether an asset is likely JSX. Attempts to detect react or react-like libraries
+ * along with
  */
-export default async function getJSXOptions(config: Config) {
+export default async function isJSX(
+  options: PluginOptions,
+  config: Config,
+): Promise<boolean> {
   if (!config.isSource) {
-    return null;
+    return false;
   }
 
-  // Find a dependency that we can map to a JSX pragma
-  const pkg = await config.getPackage();
-  const reactLib = Object.keys(JSX_PRAGMA).find(
-    libName =>
-      pkg &&
-      ((pkg.dependencies && pkg.dependencies[libName]) ||
-        (pkg.devDependencies && pkg.devDependencies[libName])),
-  );
-
-  const pragma = reactLib ? JSX_PRAGMA[reactLib].pragma : undefined;
-  const pragmaFrag = reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined;
+  if (JSX_EXTENSIONS.has(path.extname(config.searchPath))) {
+    return true;
+  }
 
-  if (pragma || JSX_EXTENSIONS[path.extname(config.searchPath)]) {
-    return {
-      plugins: [['@babel/plugin-transform-react-jsx', {pragma, pragmaFrag}]],
-    };
+  let pkg = await config.getPackage();
+  if (pkg?.alias && pkg.alias['react']) {
+    // e.g.: `{ alias: { "react": "preact/compat" } }`
+    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]) ||
+          (pkg.peerDependencies && pkg.peerDependencies[libName])),
+    );
   }
 }

package/src/types.js

@@ -4,10 +4,3 @@ export type BabelConfig = {|
   plugins?: Array<any>,
   presets?: Array<any>,
 |};
-
-export type BabelTargets = {
-  browsers?: string | Array<string>,
-  esmodules?: boolean,
-  [string]: string,
-  ...
-};

package/src/utils.js

@@ -1,10 +1,11 @@
 // @flow
 
 import type {Environment} from '@parcel/types';
-import type {BabelTargets} from './types';
+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';
 
 // List of browsers to exclude when the esmodule target is specified.
 // Based on https://caniuse.com/#feat=es6-module
@@ -45,7 +46,8 @@ export function enginesToBabelTargets(env: Environment): BabelTargets {
       targets[engineName] = engineValue;
     } else {
       invariant(typeof engineValue === 'string');
-      let minVersion = getMinSemver(engineValue);
+      if (!TargetNames.hasOwnProperty(engineName)) continue;
+      let minVersion = semver.minVersion(engineValue)?.toString();
       targets[engineName] = minVersion ?? engineValue;
     }
   }
@@ -67,15 +69,3 @@ export function enginesToBabelTargets(env: Environment): BabelTargets {
 
   return targets;
 }
-
-// TODO: Replace with `minVersion` (https://github.com/npm/node-semver#ranges-1)
-//       once semver has been upgraded across Parcel.
-export function getMinSemver(version: string) {
-  try {
-    let range = new semver.Range(version);
-    let sorted = range.set.sort((a, b) => a[0].semver.compare(b[0].semver));
-    return sorted[0][0].semver.version;
-  } catch (err) {
-    return null;
-  }
-}

package/lib/babel6.js

@@ -1,47 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = babel6;
-
-var _astConverter = require("./astConverter");
-
-async function babel6(asset, options, babelOptions) {
-  let babel = await options.packageManager.require('babel-core', asset.filePath);
-  let config = babelOptions.config;
-  config.code = false;
-  config.ast = true;
-  config.filename = asset.filePath;
-  config.babelrc = false;
-  config.parserOpts = Object.assign({}, config.parserOpts, {
-    allowReturnOutsideFunction: true,
-    allowHashBang: true,
-    ecmaVersion: Infinity,
-    strictMode: false,
-    sourceType: 'module',
-    locations: true
-  }); // Passing a list of plugins as part of parserOpts seems to override any custom
-  // syntax plugins a user might have added (e.g. decorators). We add dynamicImport
-  // using a plugin instead.
-
-  config.plugins = (config.plugins || []).concat(dynamicImport);
-  let res = babel.transform((await asset.getCode()), config);
-
-  if (res.ast) {
-    return {
-      type: 'babel',
-      version: '7.0.0',
-      program: (0, _astConverter.babel6toBabel7)(res.ast)
-    };
-  }
-}
-
-function dynamicImport() {
-  return {
-    manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push('dynamicImport');
-    }
-
-  };
-}

package/lib/babelErrorUtils.js

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

package/lib/env.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getEnvOptions;
-
-var _presetEnv = _interopRequireDefault(require("@babel/preset-env"));
-
-var _getBabelTargets = _interopRequireDefault(require("./getBabelTargets"));
-
-var _utils = require("./utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Generates a @babel/preset-env config for an asset.
- * This is done by finding the source module's target engines, and the app's
- * target engines, and doing a diff to include only the necessary plugins.
- */
-async function getEnvOptions(config) {
-  // Load the target engines for the app and generate a @babel/preset-env config
-  let appBabelTargets = (0, _utils.enginesToBabelTargets)(config.env); // If this is the app module, the source and target will be the same, so just compile everything.
-  // Otherwise, load the source engines and generate a babel-present-env config.
-
-  if (!config.isSource) {
-    let sourceBabelTargets = await (0, _getBabelTargets.default)(config);
-
-    if (!sourceBabelTargets || !shouldCompileFurther(sourceBabelTargets, appBabelTargets)) {
-      return null;
-    }
-  }
-
-  return {
-    targets: appBabelTargets,
-    presets: [['@parcel/babel-preset-env', {
-      useBuiltIns: 'entry',
-      corejs: 3,
-      shippedProposals: true,
-      ignoreBrowserslistConfig: true,
-      targets: appBabelTargets
-    }]]
-  };
-}
-
-function getNeededPlugins(targets) {
-  return (0, _presetEnv.default)({
-    assertVersion: () => true
-  }, {
-    targets: targets
-  }).plugins.filter(p => p[0]);
-}
-
-function shouldCompileFurther(sourceBabelTargets, appBabelTargets) {
-  let sourcePlugins = new Set(getNeededPlugins(sourceBabelTargets));
-  let appPlugins = getNeededPlugins(appBabelTargets); // If there is any app plugin present that was not used to compile the source,
-  // then the asset was built to a higher target and will need to be compiled
-  // further
-
-  return appPlugins.some(plugin => {
-    return !sourcePlugins.has(plugin);
-  });
-}

package/lib/getBabelTargets.js

@@ -1,86 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getBabelTargets;
-
-var _browserslist = _interopRequireDefault(require("browserslist"));
-
-var _semver = _interopRequireDefault(require("semver"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const BROWSER_CONTEXT = new Set(['browser', 'web-worker', 'service-worker']); // https://github.com/browserslist/browserslist/blob/04d7b3cc6ebeb62baf6d62aeb90f1bfd0c11117c/test/config.test.js#L23
-
-/**
- * Loads target node and browser versions from the following locations:
- *   - package.json engines field
- *   - package.json browserslist field
- *   - browserslist or .browserslistrc files
- *
- * "Targets" is the name @babel/preset-env uses for what Parcel calls engines.
- * This should not be confused with Parcel's own targets.
- * Unlike Parcel's engines, @babel/preset-env expects to work with minimum
- * versions, not semver ranges, of its targets.
- */
-async function getBabelTargets(config) {
-  let targets = {};
-  let compileTarget = BROWSER_CONTEXT.has(config.env.context) ? 'browsers' : config.env.context;
-  let pkg = await config.getPackage();
-  let packageEngines = pkg === null || pkg === void 0 ? void 0 : pkg.engines;
-
-  if (compileTarget === 'node') {
-    let nodeVersion = packageEngines === null || packageEngines === void 0 ? void 0 : packageEngines.node; // Use package.engines.node by default if we are compiling for node.
-
-    if (typeof nodeVersion === 'string') {
-      try {
-        //$FlowFixMe catch error when minVersion() returned null
-        targets.node = _semver.default.minVersion(nodeVersion).version;
-      } catch (e) {
-        throw new Error("Expected 'node' engine to be a valid Semver Range");
-      }
-    }
-  } else {
-    let browsers;
-
-    if (packageEngines && (typeof packageEngines.browsers === 'string' || Array.isArray(packageEngines.browsers))) {
-      browsers = packageEngines.browsers;
-    } else if (pkg && pkg.browserslist) {
-      browsers = pkg.browserslist;
-    } else {
-      let browserslist = await loadBrowserslist(config);
-
-      if (browserslist) {
-        browsers = browserslist;
-      }
-    } // Parse browser targets
-
-
-    if (typeof browsers === 'object' && browsers != null && !Array.isArray(browsers)) {
-      let env = process.env.NODE_ENV || 'development';
-      browsers = browsers[env] || browsers.defaults;
-    }
-
-    if (browsers) {
-      targets.browsers = (0, _browserslist.default)(browsers).sort();
-    }
-  } // Dont compile if we couldn't find any targets
-
-
-  if (Object.keys(targets).length === 0) {
-    return null;
-  }
-
-  return targets;
-}
-
-async function loadBrowserslist(config) {
-  let browserslistConfig = await config.getConfig(['browserslist', '.browserslistrc'], {
-    parse: false
-  });
-
-  if (browserslistConfig) {
-    return _browserslist.default.parseConfig(browserslistConfig);
-  }
-}

package/lib/typescript.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getTypescriptOptions;
-
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function getTypescriptOptions(config) {
-  return {
-    plugins: [['@babel/plugin-transform-typescript', {
-      isTSX: _path.default.extname(config.searchPath) === '.tsx'
-    }]]
-  };
-}

package/src/babel6.js

@@ -1,52 +0,0 @@
-// @flow
-
-import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
-
-import {babel6toBabel7} from './astConverter';
-
-export default async function babel6(
-  asset: MutableAsset,
-  options: PluginOptions,
-  babelOptions: any,
-): Promise<?AST> {
-  let babel = await options.packageManager.require(
-    'babel-core',
-    asset.filePath,
-  );
-
-  let config = babelOptions.config;
-  config.code = false;
-  config.ast = true;
-  config.filename = asset.filePath;
-  config.babelrc = false;
-  config.parserOpts = Object.assign({}, config.parserOpts, {
-    allowReturnOutsideFunction: true,
-    allowHashBang: true,
-    ecmaVersion: Infinity,
-    strictMode: false,
-    sourceType: 'module',
-    locations: true,
-  });
-
-  // Passing a list of plugins as part of parserOpts seems to override any custom
-  // syntax plugins a user might have added (e.g. decorators). We add dynamicImport
-  // using a plugin instead.
-  config.plugins = (config.plugins || []).concat(dynamicImport);
-
-  let res = babel.transform(await asset.getCode(), config);
-  if (res.ast) {
-    return {
-      type: 'babel',
-      version: '7.0.0',
-      program: babel6toBabel7(res.ast),
-    };
-  }
-}
-
-function dynamicImport() {
-  return {
-    manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push('dynamicImport');
-    },
-  };
-}

package/src/babelErrorUtils.js

@@ -1,29 +0,0 @@
-// @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) {
-    error.message = error.message
-      .slice(asset.filePath.length + 1, error.message.indexOf('\n'))
-      .trim();
-  }
-
-  error.source = await asset.getCode();
-  error.filePath = asset.filePath;
-
-  return error;
-}

package/src/env.js

@@ -1,70 +0,0 @@
-// @flow
-
-import type {Config} from '@parcel/types';
-import type {BabelTargets} from './types';
-
-import presetEnv from '@babel/preset-env';
-
-import getBabelTargets from './getBabelTargets';
-import {enginesToBabelTargets} from './utils';
-
-/**
- * Generates a @babel/preset-env config for an asset.
- * This is done by finding the source module's target engines, and the app's
- * target engines, and doing a diff to include only the necessary plugins.
- */
-export default async function getEnvOptions(config: Config) {
-  // Load the target engines for the app and generate a @babel/preset-env config
-  let appBabelTargets = enginesToBabelTargets(config.env);
-
-  // If this is the app module, the source and target will be the same, so just compile everything.
-  // Otherwise, load the source engines and generate a babel-present-env config.
-  if (!config.isSource) {
-    let sourceBabelTargets = await getBabelTargets(config);
-
-    if (
-      !sourceBabelTargets ||
-      !shouldCompileFurther(sourceBabelTargets, appBabelTargets)
-    ) {
-      return null;
-    }
-  }
-
-  return {
-    targets: appBabelTargets,
-    presets: [
-      [
-        '@parcel/babel-preset-env',
-        {
-          useBuiltIns: 'entry',
-          corejs: 3,
-          shippedProposals: true,
-          ignoreBrowserslistConfig: true,
-          targets: appBabelTargets,
-        },
-      ],
-    ],
-  };
-}
-
-function getNeededPlugins(targets: BabelTargets): Array<mixed> {
-  return presetEnv(
-    {assertVersion: () => true},
-    {targets: targets},
-  ).plugins.filter(p => p[0]);
-}
-
-function shouldCompileFurther(
-  sourceBabelTargets: BabelTargets,
-  appBabelTargets: BabelTargets,
-): boolean {
-  let sourcePlugins = new Set(getNeededPlugins(sourceBabelTargets));
-  let appPlugins = getNeededPlugins(appBabelTargets);
-
-  // If there is any app plugin present that was not used to compile the source,
-  // then the asset was built to a higher target and will need to be compiled
-  // further
-  return appPlugins.some(plugin => {
-    return !sourcePlugins.has(plugin);
-  });
-}

package/src/getBabelTargets.js

@@ -1,97 +0,0 @@
-// @flow
-
-import type {Config} from '@parcel/types';
-import type {BabelTargets} from './types';
-
-import browserslist from 'browserslist';
-import semver from 'semver';
-
-const BROWSER_CONTEXT = new Set(['browser', 'web-worker', 'service-worker']);
-
-// https://github.com/browserslist/browserslist/blob/04d7b3cc6ebeb62baf6d62aeb90f1bfd0c11117c/test/config.test.js#L23
-type BrowserslistConfig = {|[string]: string | Array<string>|};
-
-/**
- * Loads target node and browser versions from the following locations:
- *   - package.json engines field
- *   - package.json browserslist field
- *   - browserslist or .browserslistrc files
- *
- * "Targets" is the name @babel/preset-env uses for what Parcel calls engines.
- * This should not be confused with Parcel's own targets.
- * Unlike Parcel's engines, @babel/preset-env expects to work with minimum
- * versions, not semver ranges, of its targets.
- */
-export default async function getBabelTargets(
-  config: Config,
-): Promise<?BabelTargets> {
-  let targets = {};
-  let compileTarget = BROWSER_CONTEXT.has(config.env.context)
-    ? 'browsers'
-    : config.env.context;
-  let pkg = await config.getPackage();
-  let packageEngines = pkg?.engines;
-
-  if (compileTarget === 'node') {
-    let nodeVersion = packageEngines?.node;
-    // Use package.engines.node by default if we are compiling for node.
-    if (typeof nodeVersion === 'string') {
-      try {
-        //$FlowFixMe catch error when minVersion() returned null
-        targets.node = semver.minVersion(nodeVersion).version;
-      } catch (e) {
-        throw new Error("Expected 'node' engine to be a valid Semver Range");
-      }
-    }
-  } else {
-    let browsers;
-    if (
-      packageEngines &&
-      (typeof packageEngines.browsers === 'string' ||
-        Array.isArray(packageEngines.browsers))
-    ) {
-      browsers = packageEngines.browsers;
-    } else if (pkg && pkg.browserslist) {
-      browsers = pkg.browserslist;
-    } else {
-      let browserslist = await loadBrowserslist(config);
-      if (browserslist) {
-        browsers = browserslist;
-      }
-    }
-
-    // Parse browser targets
-    if (
-      typeof browsers === 'object' &&
-      browsers != null &&
-      !Array.isArray(browsers)
-    ) {
-      let env = process.env.NODE_ENV || 'development';
-      browsers = browsers[env] || browsers.defaults;
-    }
-
-    if (browsers) {
-      targets.browsers = browserslist(browsers).sort();
-    }
-  }
-
-  // Dont compile if we couldn't find any targets
-  if (Object.keys(targets).length === 0) {
-    return null;
-  }
-
-  return targets;
-}
-
-async function loadBrowserslist(config): Promise<?BrowserslistConfig> {
-  let browserslistConfig = await config.getConfig(
-    ['browserslist', '.browserslistrc'],
-    {
-      parse: false,
-    },
-  );
-
-  if (browserslistConfig) {
-    return browserslist.parseConfig(browserslistConfig);
-  }
-}

package/src/typescript.js

@@ -1,16 +0,0 @@
-// @flow
-import path from 'path';
-
-import type {Config} from '@parcel/types';
-import type {BabelConfig} from './types';
-
-export default function getTypescriptOptions(config: Config): BabelConfig {
-  return {
-    plugins: [
-      [
-        '@babel/plugin-transform-typescript',
-        {isTSX: path.extname(config.searchPath) === '.tsx'},
-      ],
-    ],
-  };
-}