Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose opt-in useESModules:"auto" from transform-runtime to toggle based on 'supportsStaticESM' #8520

Merged
merged 1 commit into from Aug 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions packages/babel-plugin-transform-runtime/src/index.js
Expand Up @@ -25,6 +25,10 @@ function resolveAbsoluteRuntime(moduleName: string, dirname: string) {
}
}

function supportsStaticESM(caller) {
return !!(caller && caller.supportsStaticESM);
}

export default declare((api, options, dirname) => {
api.assertVersion(7);

Expand All @@ -45,9 +49,9 @@ export default declare((api, options, dirname) => {
if (typeof useRuntimeHelpers !== "boolean") {
throw new Error("The 'helpers' option must be undefined, or a boolean.");
}
if (typeof useESModules !== "boolean") {
if (typeof useESModules !== "boolean" && useESModules !== "auto") {
throw new Error(
"The 'useESModules' option must be undefined, or a boolean.",
"The 'useESModules' option must be undefined, or a boolean, or 'auto'.",
);
}
if (
Expand Down Expand Up @@ -107,6 +111,9 @@ export default declare((api, options, dirname) => {
);
}

const esModules =
useESModules === "auto" ? api.caller(supportsStaticESM) : useESModules;

const injectCoreJS2 = `${corejsVersion}` === "2";
const moduleName = injectCoreJS2
? "@babel/runtime-corejs2"
Expand Down Expand Up @@ -145,7 +152,7 @@ export default declare((api, options, dirname) => {
isInteropHelper && !isModule(file.path) ? 4 : undefined;

const helpersDir =
useESModules && file.path.node.sourceType === "module"
esModules && file.path.node.sourceType === "module"
? "helpers/esm"
: "helpers";

Expand Down
@@ -0,0 +1 @@
class Foo extends Bar {}
@@ -0,0 +1,7 @@
{
"caller": {
"name": "babel-test",
"supportsStaticESM": true
},
"plugins": [["transform-runtime", { "useESModules": "auto" }], "transform-classes"]
}
@@ -0,0 +1,23 @@
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");

var _possibleConstructorReturn = require("@babel/runtime/helpers/possibleConstructorReturn");

var _getPrototypeOf = require("@babel/runtime/helpers/getPrototypeOf");

var _inherits = require("@babel/runtime/helpers/inherits");

let Foo =
/*#__PURE__*/
function (_Bar) {
"use strict";

_inherits(Foo, _Bar);

function Foo() {
_classCallCheck(this, Foo);

return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
}

return Foo;
}(Bar);
@@ -1,3 +1,7 @@
{
"caller": {
"name": "babel-test",
"supportsStaticESM": true
},
"plugins": [["transform-runtime", { "useESModules": true }], "transform-classes"]
}
@@ -0,0 +1 @@
class Foo extends Bar {}
@@ -0,0 +1,7 @@
{
"caller": {
"name": "babel-test",
"supportsStaticESM": true
},
"plugins": [["transform-runtime", { "useESModules": "auto" }], "transform-classes"]
}
@@ -0,0 +1,18 @@
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
import _inherits from "@babel/runtime/helpers/esm/inherits";

let Foo =
/*#__PURE__*/
function (_Bar) {
_inherits(Foo, _Bar);

function Foo() {
_classCallCheck(this, Foo);

return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
}

return Foo;
}(Bar);
@@ -1,3 +1,7 @@
{
"caller": {
"name": "babel-test",
"supportsStaticESM": true
},
"plugins": [["transform-runtime", { "useESModules": true }], "transform-classes"]
}