@parcel/transformer-babel 2.0.0-beta.3 → 2.0.0-dev.1510

package/lib/utils.js

@@ -4,65 +4,61 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.enginesToBabelTargets = enginesToBabelTargets;
-exports.getMinSemver = getMinSemver;
-
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _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 }; }
+// 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) {
   // "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.
   let targets = {};
-
   for (let engineName of Object.keys(env.engines)) {
-    let engineValue = env.engines[engineName]; // if the engineValue is a string, it might be a semver range. Use the minimum
-    // possible version instead.
+    let engineValue = env.engines[engineName];
 
+    // if the engineValue is a string, it might be a semver range. Use the minimum
+    // possible version instead.
     if (engineName === 'browsers') {
       targets[engineName] = engineValue;
     } else {
+      var _semver$minVersion;
       (0, _assert().default)(typeof engineValue === 'string');
-      if (!_options().TargetNames.hasOwnProperty(engineName)) continue;
-      let minVersion = getMinSemver(engineValue);
+      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;
     }
   }
-
   if (env.outputFormat === 'esmodule' && env.isBrowser()) {
     // If there is already a browsers target, add a blacklist to exclude
     // instead of using babel's esmodules target. This allows specifying
@@ -75,18 +71,5 @@ function enginesToBabelTargets(env) {
       targets.esmodules = true;
     }
   }
-
   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,6 +1,6 @@
 {
   "name": "@parcel/transformer-babel",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-dev.1510+a9bb85adf",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,27 +17,23 @@
   "source": "src/BabelTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "^2.0.0-dev.1508+a9bb85adf"
   },
   "dependencies": {
-    "@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/traverse": "^7.0.0",
-    "@parcel/babel-ast-utils": "2.0.0-beta.3",
-    "@parcel/plugin": "2.0.0-beta.3",
-    "@parcel/source-map": "2.0.0-rc.1.0",
-    "@parcel/utils": "2.0.0-beta.3",
+    "@parcel/diagnostic": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/plugin": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/source-map": "^2.1.1",
+    "@parcel/utils": "2.0.0-dev.1510+a9bb85adf",
     "browserslist": "^4.6.6",
-    "core-js": "^3.2.1",
+    "json5": "^2.2.0",
     "nullthrows": "^1.1.1",
-    "semver": "^5.7.0"
+    "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.0",
-    "@babel/preset-env": "^7.0.0",
-    "@parcel/types": "2.0.0-beta.3"
+    "@babel/core": "^7.22.11",
+    "@babel/preset-env": "^7.22.14",
+    "@babel/types": "^7.22.11",
+    "@parcel/types": "2.0.0-dev.1510+a9bb85adf"
   },
-  "gitHead": "bf03f018093f8c7ca4c3a544524e15065a637b3b"
+  "gitHead": "a9bb85adf8f3b38631e178b3aacaa30c78696e36"
 }

package/src/BabelTransformer.js

@@ -1,29 +1,23 @@
 // @flow strict-local
 
-import {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 generate from '@babel/generator';
 import babel7 from './babel7';
 import {load} from './config';
 
 export default (new Transformer({
-  async loadConfig({config, options, logger}) {
-    await load(config, options, logger);
+  loadConfig({config, options, logger}) {
+    return load(config, options, logger);
   },
 
   canReuseAST({ast}) {
     return ast.type === 'babel' && semver.satisfies(ast.version, '^7.0.0');
   },
 
-  async transform({asset, config, options}) {
-    // TODO: Provide invalidateOnEnvChange on config?
-    asset.invalidateOnEnvChange('BABEL_ENV');
-    asset.invalidateOnEnvChange('NODE_ENV');
-
-    // TODO: come up with a better name
+  async transform({asset, config, logger, options, tracer}) {
     try {
       if (config?.config) {
         if (
@@ -33,11 +27,19 @@ export default (new Transformer({
           await babel7({
             asset,
             options,
+            logger,
             babelOptions: config,
             additionalPlugins: asset.meta.babelPlugins,
+            tracer,
           });
         } else {
-          await babel7({asset, options, babelOptions: config});
+          await babel7({
+            asset,
+            options,
+            logger,
+            babelOptions: config,
+            tracer,
+          });
         }
       }
 
@@ -53,6 +55,22 @@ export default (new Transformer({
       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,

package/src/babel7.js

@@ -1,11 +1,19 @@
 // @flow
 
-import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
+import type {
+  MutableAsset,
+  AST,
+  PluginOptions,
+  PluginTracer,
+  PluginLogger,
+} from '@parcel/types';
+import typeof * as BabelCore from '@babel/core';
 
 import invariant from 'assert';
-import * as internalBabelCore from '@babel/core';
+import path from 'path';
+import {md} from '@parcel/diagnostic';
 import {relativeUrl} from '@parcel/utils';
-import {remapAstLocations} from '@parcel/babel-ast-utils';
+import {remapAstLocations} from './remapAstLocations';
 
 import packageJson from '../package.json';
 
@@ -15,21 +23,25 @@ invariant(typeof transformerVersion === 'string');
 type Babel7TransformOptions = {|
   asset: MutableAsset,
   options: PluginOptions,
+  logger: PluginLogger,
   babelOptions: any,
   additionalPlugins?: Array<any>,
+  tracer: PluginTracer,
 |};
 
 export default async function babel7(
   opts: Babel7TransformOptions,
 ): Promise<?AST> {
-  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 {asset, options, babelOptions, additionalPlugins = [], tracer} = 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,
@@ -64,6 +76,28 @@ export default async function babel7(
     },
   };
 
+  if (tracer.enabled) {
+    config.wrapPluginVisitorMethod = (
+      key: string,
+      nodeType: string,
+      fn: Function,
+    ) => {
+      return function () {
+        let pluginKey = key;
+        if (pluginKey.startsWith(options.projectRoot)) {
+          pluginKey = path.relative(options.projectRoot, pluginKey);
+        }
+        const measurement = tracer.createMeasurement(
+          pluginKey,
+          nodeType,
+          path.relative(options.projectRoot, asset.filePath),
+        );
+        fn.apply(this, arguments);
+        measurement && measurement.end();
+      };
+    };
+  }
+
   let ast = await asset.getAST();
   let res;
   if (ast) {
@@ -77,7 +111,25 @@ export default async function babel7(
     if (res.ast) {
       let map = await asset.getMap();
       if (map) {
-        remapAstLocations(res.ast, map);
+        remapAstLocations(babelCore.types, res.ast, map);
+      }
+    }
+    if (res.externalDependencies) {
+      for (let f of res.externalDependencies) {
+        if (!path.isAbsolute(f)) {
+          opts.logger.warn({
+            message: md`Ignoring non-absolute Babel external dependency: ${f}`,
+            hints: [
+              'Please report this to the corresponding Babel plugin and/or to Parcel.',
+            ],
+          });
+        } else {
+          if (await options.inputFS.exists(f)) {
+            asset.invalidateOnFileChange(f);
+          } else {
+            asset.invalidateOnFileCreate({filePath: f});
+          }
+        }
       }
     }
   }

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;
+}