@parcel/transformer-babel 2.0.0-nightly.142 → 2.0.0-nightly.1421

package/src/flow.js

@@ -1,19 +1,66 @@
 // @flow
 
-import type {Config} from '@parcel/types';
+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.
  */
-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;
+  }
+
+  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/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/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/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,11 +1,26 @@
 // @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';
+
+// 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
@@ -47,7 +62,7 @@ export function enginesToBabelTargets(env: Environment): BabelTargets {
     } else {
       invariant(typeof engineValue === 'string');
       if (!TargetNames.hasOwnProperty(engineName)) continue;
-      let minVersion = getMinSemver(engineValue);
+      let minVersion = semver.minVersion(engineValue)?.toString();
       targets[engineName] = minVersion ?? engineValue;
     }
   }
@@ -69,15 +84,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/astConverter.js

@@ -1,106 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.babel7toBabel6 = babel7toBabel6;
-exports.babel6toBabel7 = babel6toBabel7;
-
-var _traverse = _interopRequireDefault(require("@babel/traverse"));
-
-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/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/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'
-    }]]
-  };
-}