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

package/lib/jsx.js

@@ -3,65 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = getJSXOptions;
+exports.default = isJSX;
 
-var _path = _interopRequireDefault(require("path"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const JSX_EXTENSIONS = {
-  '.jsx': true,
-  '.tsx': true
-};
-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
  */
 
-async function getJSXOptions(options, config) {
+async function isJSX(options, config) {
   if (!config.isSource) {
-    return null;
+    return false;
+  }
+
+  if (JSX_EXTENSIONS.has(_path().default.extname(config.searchPath))) {
+    return true;
   }
 
   let pkg = await config.getPackage();
-  let reactLib;
 
-  if ((pkg === null || pkg === void 0 ? void 0 : pkg.alias) && pkg.alias['react']) {
+  if (pkg !== null && pkg !== void 0 && pkg.alias && pkg.alias['react']) {
     // e.g.: `{ alias: { "react": "preact/compat" } }`
-    reactLib = 'react';
+    return true;
   } else {
-    // Find a dependency that we can map to a JSX pragma
-    reactLib = Object.keys(JSX_PRAGMA).find(libName => pkg && (pkg.dependencies && pkg.dependencies[libName] || pkg.devDependencies && pkg.devDependencies[libName]));
-  }
-
-  let pragma = reactLib ? JSX_PRAGMA[reactLib].pragma : undefined;
-  let pragmaFrag = reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined;
-
-  if (pragma || JSX_EXTENSIONS[_path.default.extname(config.searchPath)]) {
-    return {
-      presets: [['@babel/preset-react', {
-        pragma,
-        pragmaFrag,
-        development: options.mode === 'development'
-      }]]
-    };
+    // 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/lib/remapAstLocations.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.remapAstLocations = remapAstLocations;
+
+function remapAstLocations(t, ast, map) {
+  // remap ast to original mappings
+  // This improves sourcemap accuracy and fixes sourcemaps when scope-hoisting
+  traverseAll(t, ast.program, node => {
+    if (node.loc) {
+      var _node$loc;
+
+      if ((_node$loc = node.loc) !== null && _node$loc !== void 0 && _node$loc.start) {
+        let mapping = map.findClosestMapping(node.loc.start.line, node.loc.start.column);
+
+        if (mapping !== null && mapping !== void 0 && 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, node, visitor) {
+  if (!node) {
+    return;
+  }
+
+  visitor(node);
+
+  for (let key of t.VISITOR_KEYS[node.type] || []) {
+    // $FlowFixMe
+    let subNode = 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/lib/utils.js

@@ -4,18 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.enginesToBabelTargets = enginesToBabelTargets;
-exports.getMinSemver = getMinSemver;
 
-var _assert = _interopRequireDefault(require("assert"));
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
 
-var _semver = _interopRequireDefault(require("semver"));
+  _assert = function () {
+    return data;
+  };
 
-var _options = require("@babel/helper-compilation-targets/lib/options");
+  return data;
+}
+
+function _semver() {
+  const data = _interopRequireDefault(require("semver"));
+
+  _semver = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// List of browsers to exclude when the esmodule target is specified.
+// 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
+
 const ESMODULE_BROWSERS = ['not ie <= 11', 'not edge < 16', 'not firefox < 60', 'not chrome < 61', 'not safari < 11', 'not opera < 48', 'not ios_saf < 11', 'not op_mini all', 'not android < 76', 'not blackberry > 0', 'not op_mob > 0', 'not and_chr < 76', 'not and_ff < 68', 'not ie_mob > 0', 'not and_uc > 0', 'not samsung < 8.2', 'not and_qq > 0', 'not baidu > 0', 'not kaios > 0'];
 
 function enginesToBabelTargets(env) {
@@ -32,9 +60,11 @@ function enginesToBabelTargets(env) {
     if (engineName === 'browsers') {
       targets[engineName] = engineValue;
     } else {
-      (0, _assert.default)(typeof engineValue === 'string');
-      if (!_options.TargetNames.hasOwnProperty(engineName)) continue;
-      let minVersion = getMinSemver(engineValue);
+      var _semver$minVersion;
+
+      (0, _assert().default)(typeof engineValue === 'string');
+      if (!TargetNames.hasOwnProperty(engineName)) continue;
+      let minVersion = (_semver$minVersion = _semver().default.minVersion(engineValue)) === null || _semver$minVersion === void 0 ? void 0 : _semver$minVersion.toString();
       targets[engineName] = minVersion !== null && minVersion !== void 0 ? minVersion : engineValue;
     }
   }
@@ -53,16 +83,4 @@ function enginesToBabelTargets(env) {
   }
 
   return targets;
-} // TODO: Replace with `minVersion` (https://github.com/npm/node-semver#ranges-1)
-//       once semver has been upgraded across Parcel.
-
-
-function getMinSemver(version) {
-  try {
-    let range = new _semver.default.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/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/transformer-babel",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,32 +16,24 @@
   "main": "lib/BabelTransformer.js",
   "source": "src/BabelTransformer.js",
   "engines": {
-    "node": ">= 10.0.0",
-    "parcel": "^2.0.0-alpha.1.1"
+    "node": ">= 12.0.0",
+    "parcel": "2.0.0-nightly.1000+5530a6ef"
   },
   "dependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/generator": "^7.0.0",
-    "@babel/helper-compilation-targets": "^7.8.4",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.4.5",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/traverse": "^7.0.0",
-    "@parcel/babel-ast-utils": "2.0.0-beta.1",
-    "@parcel/babel-preset-env": "2.0.0-beta.1",
-    "@parcel/plugin": "2.0.0-beta.1",
-    "@parcel/utils": "2.0.0-beta.1",
+    "@parcel/diagnostic": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/plugin": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
     "browserslist": "^4.6.6",
-    "core-js": "^3.2.1",
+    "json5": "^2.2.0",
     "nullthrows": "^1.1.1",
     "semver": "^5.7.0"
   },
   "devDependencies": {
-    "@parcel/types": "2.0.0-beta.1"
-  },
-  "peerDependencies": {
-    "@parcel/core": "^2.0.0-alpha.3.1"
+    "@babel/core": "^7.12.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/types": "^7.12.0",
+    "@parcel/types": "2.0.0-nightly.1002+5530a6ef"
   },
-  "gitHead": "74335525be92e23bac4ed1bf30595443cfb238e3"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/BabelTransformer.js

@@ -1,22 +1,16 @@
 // @flow strict-local
 
-import {generate, babelErrorEnhancer} from '@parcel/babel-ast-utils';
+import {babelErrorEnhancer} from './babelErrorUtils';
 import {Transformer} from '@parcel/plugin';
+import {relativeUrl} from '@parcel/utils';
+import SourceMap from '@parcel/source-map';
 import semver from 'semver';
 import babel7 from './babel7';
-import {load, preSerialize, postDeserialize} from './config';
+import {load} from './config';
 
-export default new Transformer({
-  async loadConfig({config, options, logger}) {
-    await load(config, options, logger);
-  },
-
-  preSerializeConfig({config}) {
-    return preSerialize(config);
-  },
-
-  postDeserializeConfig({config, options}) {
-    return postDeserialize(config, options);
+export default (new Transformer({
+  loadConfig({config, options, logger}) {
+    return load(config, options, logger);
   },
 
   canReuseAST({ast}) {
@@ -24,16 +18,20 @@ export default new Transformer({
   },
 
   async transform({asset, config, options}) {
-    // TODO: come up with a better name
     try {
       if (config?.config) {
         if (
           asset.meta.babelPlugins != null &&
           Array.isArray(asset.meta.babelPlugins)
         ) {
-          await babel7(asset, options, config, asset.meta.babelPlugins);
+          await babel7({
+            asset,
+            options,
+            babelOptions: config,
+            additionalPlugins: asset.meta.babelPlugins,
+          });
         } else {
-          await babel7(asset, options, config);
+          await babel7({asset, options, babelOptions: config});
         }
       }
 
@@ -43,7 +41,54 @@ export default new Transformer({
     }
   },
 
-  generate({asset, ast, options}) {
-    return generate({asset, ast, options});
+  async generate({asset, ast, options}) {
+    let originalSourceMap = await asset.getMap();
+    let sourceFileName: string = 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(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,
+    };
   },
-});
+}): Transformer);

package/src/babel7.js

@@ -1,31 +1,37 @@
 // @flow
 
 import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
+import typeof * as BabelCore from '@babel/core';
 
 import invariant from 'assert';
-import * as bundledBabelCore from '@babel/core';
 import {relativeUrl} from '@parcel/utils';
+import {remapAstLocations} from './remapAstLocations';
 
-import {BABEL_RANGE} from './constants';
 import packageJson from '../package.json';
 
 const transformerVersion: mixed = packageJson.version;
 invariant(typeof transformerVersion === 'string');
 
-export default async function babel7(
+type Babel7TransformOptions = {|
   asset: MutableAsset,
   options: PluginOptions,
   babelOptions: any,
-  additionalPlugins: Array<any> = [],
+  additionalPlugins?: Array<any>,
+|};
+
+export default async function babel7(
+  opts: Babel7TransformOptions,
 ): Promise<?AST> {
-  // If this is an internally generated config, use our internal @babel/core,
-  // otherwise require a local version from the package we're compiling.
-  let babel = babelOptions.internal
-    ? bundledBabelCore
-    : await options.packageManager.require('@babel/core', asset.filePath, {
-        range: BABEL_RANGE,
-        autoinstall: options.autoinstall,
-      });
+  let {asset, options, babelOptions, additionalPlugins = []} = opts;
+  const babelCore: BabelCore = await options.packageManager.require(
+    '@babel/core',
+    asset.filePath,
+    {
+      range: '^7.12.0',
+      saveDev: true,
+      shouldAutoInstall: options.shouldAutoInstall,
+    },
+  );
 
   let config = {
     ...babelOptions.config,
@@ -41,7 +47,16 @@ export default async function babel7(
       allowReturnOutsideFunction: true,
       strictMode: false,
       sourceType: 'module',
-      plugins: ['dynamicImport'],
+      plugins: [
+        ...(babelOptions.config.parserOpts?.plugins ?? []),
+        ...(babelOptions.syntaxPlugins ?? []),
+        // Applied by preset-env
+        'classProperties',
+        'classPrivateProperties',
+        'classPrivateMethods',
+        'exportDefaultFrom',
+        // 'topLevelAwait'
+      ],
     },
     caller: {
       name: 'parcel',
@@ -54,13 +69,19 @@ export default async function babel7(
   let ast = await asset.getAST();
   let res;
   if (ast) {
-    res = await babel.transformFromAstAsync(
+    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) {
+        remapAstLocations(babelCore.types, res.ast, map);
+      }
+    }
   }
 
   if (res.ast) {

package/src/babelErrorUtils.js

@@ -0,0 +1,30 @@
+// @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) {
+    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;
+}