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

package/lib/jsx.js

@@ -3,56 +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(config) {
+async function isJSX(options, config) {
   if (!config.isSource) {
-    return null;
-  } // 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 (pragma || JSX_EXTENSIONS[_path.default.extname(config.searchPath)]) {
-    return {
-      plugins: [['@babel/plugin-transform-react-jsx', {
-        pragma,
-        pragmaFrag
-      }]]
-    };
+    return false;
+  }
+
+  if (JSX_EXTENSIONS.has(_path().default.extname(config.searchPath))) {
+    return true;
+  }
+
+  let pkg = await config.getPackage();
+
+  if (pkg !== null && pkg !== void 0 && 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/lib/utils.js

@@ -4,11 +4,36 @@ 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;
+  };
+
+  return data;
+}
+
+function _semver() {
+  const data = _interopRequireDefault(require("semver"));
+
+  _semver = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _options() {
+  const data = require("@babel/helper-compilation-targets/lib/options");
+
+  _options = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,8 +55,11 @@ function enginesToBabelTargets(env) {
     if (engineName === 'browsers') {
       targets[engineName] = engineValue;
     } else {
-      (0, _assert.default)(typeof engineValue === 'string');
-      let minVersion = getMinSemver(engineValue);
+      var _semver$minVersion;
+
+      (0, _assert().default)(typeof engineValue === 'string');
+      if (!_options().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;
     }
   }
@@ -50,16 +78,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-nightly.97+a63f3fc9",
+  "version": "2.1.0",
   "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,28 +16,30 @@
   "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.1.0"
   },
   "dependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/generator": "^7.0.0",
+    "@babel/core": "^7.12.0",
+    "@babel/generator": "^7.9.0",
+    "@babel/helper-compilation-targets": "^7.8.4",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/plugin-transform-react-jsx": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.4.5",
-    "@babel/preset-env": "^7.0.0",
     "@babel/traverse": "^7.0.0",
-    "@parcel/babel-preset-env": "2.0.0-nightly.97+a63f3fc9",
-    "@parcel/plugin": "2.0.0-nightly.97+a63f3fc9",
-    "@parcel/source-map": "2.0.0-nightly.97+a63f3fc9",
-    "@parcel/utils": "2.0.0-nightly.97+a63f3fc9",
+    "@parcel/babel-ast-utils": "^2.1.0",
+    "@parcel/diagnostic": "^2.1.0",
+    "@parcel/plugin": "^2.1.0",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "^2.1.0",
     "browserslist": "^4.6.6",
     "core-js": "^3.2.1",
+    "json5": "^2.1.0",
     "nullthrows": "^1.1.1",
     "semver": "^5.7.0"
   },
   "devDependencies": {
-    "@parcel/types": "2.0.0-nightly.97+a63f3fc9"
+    "@babel/core": "^7.12.0",
+    "@babel/preset-env": "^7.0.0",
+    "@parcel/types": "^2.1.0"
   },
-  "gitHead": "a63f3fc9726483219412920faeb255e035f90747"
+  "gitHead": "5a80fbe4af8797d0aab248a66f5254f42f00e83e"
 }

package/src/BabelTransformer.js

@@ -1,25 +1,17 @@
-// @flow
+// @flow strict-local
 
+import {babelErrorEnhancer} from '@parcel/babel-ast-utils';
 import {Transformer} from '@parcel/plugin';
+import {relativeUrl} from '@parcel/utils';
 import SourceMap from '@parcel/source-map';
-import generate from '@babel/generator';
 import semver from 'semver';
+import generate from '@babel/generator';
 import babel7 from './babel7';
-import {relativeUrl} from '@parcel/utils';
-import {load, preSerialize, postDeserialize} from './config';
-import {babelErrorEnhancer} from './babelErrorUtils';
-
-export default new Transformer({
-  async loadConfig({config, options, logger}) {
-    await load(config, options, logger);
-  },
-
-  preSerializeConfig({config}) {
-    return preSerialize(config);
-  },
+import {load} from './config';
 
-  postDeserializeConfig({config, options}) {
-    return postDeserialize(config, options);
+export default (new Transformer({
+  loadConfig({config, options, logger}) {
+    return load(config, options, logger);
   },
 
   canReuseAST({ast}) {
@@ -27,19 +19,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 && Array.isArray(asset.meta.babelPlugins)) {
-          // $FlowFixMe
-          asset.ast = await babel7(
+        if (
+          asset.meta.babelPlugins != null &&
+          Array.isArray(asset.meta.babelPlugins)
+        ) {
+          await babel7({
             asset,
             options,
-            config,
-            asset.meta.babelPlugins,
-          );
+            babelOptions: config,
+            additionalPlugins: asset.meta.babelPlugins,
+          });
         } else {
-          asset.ast = await babel7(asset, options, config);
+          await babel7({asset, options, babelOptions: config});
         }
       }
 
@@ -49,27 +42,38 @@ export default new Transformer({
     }
   },
 
-  async generate({asset, options}) {
+  async generate({asset, ast, options}) {
+    let originalSourceMap = await asset.getMap();
     let sourceFileName: string = relativeUrl(
       options.projectRoot,
       asset.filePath,
     );
+    let {code, rawMappings} = generate(ast.program, {
+      sourceFileName,
+      sourceMaps: !!asset.env.sourceMap,
+      comments: true,
+    });
 
-    try {
-      // $FlowFixMe: figure out how to make AST required in generate method
-      let generated = generate(asset.ast.program, {
-        sourceMaps: options.sourceMaps,
-        sourceFileName: sourceFileName,
-      });
+    let map = new SourceMap(options.projectRoot);
+    if (rawMappings) {
+      map.addIndexedMappings(rawMappings);
+    }
 
-      return {
-        code: generated.code,
-        map: new SourceMap(generated.rawMappings, {
-          [sourceFileName]: null,
-        }),
-      };
-    } catch (e) {
-      throw await babelErrorEnhancer(e, asset);
+    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

@@ -2,23 +2,34 @@
 
 import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
 
-import packageJson from '../package.json';
 import invariant from 'assert';
+import * as internalBabelCore from '@babel/core';
+import {relativeUrl} from '@parcel/utils';
+import {remapAstLocations} from '@parcel/babel-ast-utils';
+
+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
-    ? require('@babel/core')
-    : await options.packageManager.require('@babel/core', asset.filePath);
+  let {asset, options, babelOptions, additionalPlugins = []} = opts;
+  const babelCore = babelOptions.internal
+    ? internalBabelCore
+    : await options.packageManager.require('@babel/core', asset.filePath, {
+        range: '^7.12.0',
+        saveDev: true,
+        shouldAutoInstall: options.shouldAutoInstall,
+      });
 
   let config = {
     ...babelOptions.config,
@@ -30,33 +41,52 @@ export default async function babel7(
     configFile: false,
     parserOpts: {
       ...babelOptions.config.parserOpts,
+      sourceFilename: relativeUrl(options.projectRoot, asset.filePath),
       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',
       version: transformerVersion,
       targets: JSON.stringify(babelOptions.targets),
+      outputFormat: asset.env.outputFormat,
     },
   };
 
-  let code = await asset.getCode();
-
+  let ast = await asset.getAST();
   let res;
-  if (asset.ast) {
-    res = babel.transformFromAstSync(asset.ast.program, code, config);
+  if (ast) {
+    res = await babelCore.transformFromAstAsync(
+      ast.program,
+      asset.isASTDirty() ? undefined : await asset.getCode(),
+      config,
+    );
   } else {
-    res = babel.transformSync(code, config);
+    res = await babelCore.transformAsync(await asset.getCode(), config);
+    if (res.ast) {
+      let map = await asset.getMap();
+      if (map) {
+        remapAstLocations(res.ast, map);
+      }
+    }
   }
 
   if (res.ast) {
-    return {
+    asset.setAST({
       type: 'babel',
       version: '7.0.0',
       program: res.ast,
-      isDirty: true,
-    };
+    });
   }
 }