cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reference the CommonJS helpers when a file is not explicitly a module. (#8518)

Browse Source
This commit is contained in:
Logan Smyth 2018-08-23 15:09:14 -07:00 committed by GitHub
parent 22bcfbe469
commit 023044c1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/babel-plugin-transform-runtime/src/index.js
View File

@ -107,7 +107,6 @@ export default declare((api, options, dirname) => {
);
}
const helpersDir = useESModules ? "helpers/esm" : "helpers";
const injectCoreJS2 = `${corejsVersion}` === "2";
const moduleName = injectCoreJS2
? "@babel/runtime-corejs2"
@ -145,6 +144,11 @@ export default declare((api, options, dirname) => {
const blockHoist =
isInteropHelper && !isModule(file.path) ? 4 : undefined;
const helpersDir =
useESModules && file.path.node.sourceType === "module"
? "helpers/esm"
: "helpers";
return this.addDefaultImport(
`${modulePath}/${helpersDir}/${name}`,
name,

0
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/input.js → packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/input.mjs vendored
View File

23
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/output.js vendored
View File

@ -1,23 +0,0 @@
var _classCallCheck = require("@babel/runtime-corejs2/helpers/esm/classCallCheck");
var _possibleConstructorReturn = require("@babel/runtime-corejs2/helpers/esm/possibleConstructorReturn");
var _getPrototypeOf = require("@babel/runtime-corejs2/helpers/esm/getPrototypeOf");
var _inherits = require("@babel/runtime-corejs2/helpers/esm/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);

18
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/output.mjs vendored Normal file
View File

@ -0,0 +1,18 @@
import _classCallCheck from "@babel/runtime-corejs2/helpers/esm/classCallCheck";
import _possibleConstructorReturn from "@babel/runtime-corejs2/helpers/esm/possibleConstructorReturn";
import _getPrototypeOf from "@babel/runtime-corejs2/helpers/esm/getPrototypeOf";
import _inherits from "@babel/runtime-corejs2/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);

0
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/input.js → packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/input.mjs vendored
View File

23
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/output.js vendored
View File

@ -1,23 +0,0 @@
var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck");
var _possibleConstructorReturn = require("@babel/runtime-corejs2/helpers/possibleConstructorReturn");
var _getPrototypeOf = require("@babel/runtime-corejs2/helpers/getPrototypeOf");
var _inherits = require("@babel/runtime-corejs2/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);

18
packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/output.mjs vendored Normal file
View File

@ -0,0 +1,18 @@
import _classCallCheck from "@babel/runtime-corejs2/helpers/classCallCheck";
import _possibleConstructorReturn from "@babel/runtime-corejs2/helpers/possibleConstructorReturn";
import _getPrototypeOf from "@babel/runtime-corejs2/helpers/getPrototypeOf";
import _inherits from "@babel/runtime-corejs2/helpers/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);

0
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/input.js → packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/input.js vendored
View File

0
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/options.json → packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/options.json vendored
View File

8
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/output.js → packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js vendored
View File

@ -1,10 +1,10 @@
var _classCallCheck = require("@babel/runtime/helpers/esm/classCallCheck");
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
var _possibleConstructorReturn = require("@babel/runtime/helpers/esm/possibleConstructorReturn");
var _possibleConstructorReturn = require("@babel/runtime/helpers/possibleConstructorReturn");
var _getPrototypeOf = require("@babel/runtime/helpers/esm/getPrototypeOf");
var _getPrototypeOf = require("@babel/runtime/helpers/getPrototypeOf");
var _inherits = require("@babel/runtime/helpers/esm/inherits");
var _inherits = require("@babel/runtime/helpers/inherits");
let Foo =
/*#__PURE__*/

1
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/input.mjs vendored Normal file
View File

@ -0,0 +1 @@
class Foo extends Bar {}

3
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"plugins": [["transform-runtime", { "useESModules": true }], "transform-classes"]
}

18
packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/output.mjs vendored Normal file
View File

@ -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);