@parcel/transformer-babel 2.0.0-beta.2 → 2.0.0-nightly.1004

package/lib/utils.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.enginesToBabelTargets = enginesToBabelTargets;
-exports.getMinSemver = getMinSemver;
 
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
@@ -26,20 +25,25 @@ function _semver() {
   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 }; }
 
-// 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) {
@@ -56,9 +60,11 @@ function enginesToBabelTargets(env) {
     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;
     }
   }
@@ -77,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,6 +1,6 @@
 {
   "name": "@parcel/transformer-babel",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-nightly.1004+47379bf8",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,30 +17,23 @@
   "source": "src/BabelTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "2.0.0-nightly.1002+47379bf8"
   },
   "dependencies": {
-    "@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.2",
-    "@parcel/babel-preset-env": "2.0.0-beta.2",
-    "@parcel/plugin": "2.0.0-beta.2",
-    "@parcel/utils": "2.0.0-beta.2",
+    "@parcel/diagnostic": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/plugin": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "2.0.0-nightly.1004+47379bf8",
     "browserslist": "^4.6.6",
-    "core-js": "^3.2.1",
+    "json5": "^2.2.0",
     "nullthrows": "^1.1.1",
     "semver": "^5.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.0",
-    "@parcel/types": "2.0.0-beta.2"
-  },
-  "peerDependencies": {
-    "@babel/core": "^7.12.0"
+    "@babel/preset-env": "^7.0.0",
+    "@babel/types": "^7.12.0",
+    "@parcel/types": "2.0.0-nightly.1004+47379bf8"
   },
-  "gitHead": "a3aa86815e098c90fda72a08d29646ff059ab74d"
+  "gitHead": "47379bf8fabeb2cfe03ade8802d942388b153e5b"
 }

package/src/BabelTransformer.js

@@ -1,14 +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} 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}) {
@@ -16,20 +18,20 @@ export default (new Transformer({
   },
 
   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
     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});
         }
       }
 
@@ -39,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,22 +1,38 @@
 // @flow
 
 import type {MutableAsset, AST, PluginOptions} from '@parcel/types';
+import typeof * as BabelCore from '@babel/core';
 
 import invariant from 'assert';
-import * as babel from '@babel/core';
 import {relativeUrl} from '@parcel/utils';
+import {remapAstLocations} from './remapAstLocations';
 
 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> {
+  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,
     plugins: additionalPlugins.concat(babelOptions.config.plugins),
@@ -31,6 +47,16 @@ export default async function babel7(
       allowReturnOutsideFunction: true,
       strictMode: false,
       sourceType: 'module',
+      plugins: [
+        ...(babelOptions.config.parserOpts?.plugins ?? []),
+        ...(babelOptions.syntaxPlugins ?? []),
+        // Applied by preset-env
+        'classProperties',
+        'classPrivateProperties',
+        'classPrivateMethods',
+        'exportDefaultFrom',
+        // 'topLevelAwait'
+      ],
     },
     caller: {
       name: 'parcel',
@@ -43,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;
+}