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.

Sign up for GitHub

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

Jump to bottom

Add ".js" extension to injected polyfill imports #10549

Merged
merged 3 commits into from Dec 6, 2019
Merged

Add ".js" extension to injected polyfill imports #10549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dced5e
Node modules compatibility: add ".js" extension to imported polyfills
shimataro Oct 19, 2019
42e95c0
Update fixtures
shimataro Oct 19, 2019
fdf5c74
add extensions on calling `addDefaultImport()`, not in the function.
shimataro Oct 19, 2019
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
4 changes: 2 additions & 2 deletions ...-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js
View file
Open in desktop
@@ -1,8 +1,8 @@
"use strict";

var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault.js");

var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral.js"));

function _templateObject() {
const data = (0, _taggedTemplateLiteral2.default)(["foo"]);
Expand Down
4 changes: 2 additions & 2 deletions .../babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js
View file
Open in desktop
@@ -1,9 +1,9 @@
"use strict";

var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault.js");

exports.__esModule = true;

var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault.js"));

console.log(_interopRequireDefault2.default);
4 changes: 2 additions & 2 deletions .../babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js
View file
Open in desktop
@@ -1,8 +1,8 @@
"use strict";

var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault.js");

var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral.js"));

function _templateObject() {
const data = (0, _taggedTemplateLiteral2.default)(["foo"]);
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js
View file
Open in desktop
@@ -1,11 +1,11 @@
"use strict";

var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault.js");

Object.defineProperty(exports, "__esModule", {
value: true
});

var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault.js"));

console.log(_interopRequireDefault2.default);
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _regeneratorRuntime = require("@babel/runtime/regenerator");
var _regeneratorRuntime = require("@babel/runtime/regenerator/index.js");

var _marked =
/*#__PURE__*/
Expand Down
20 changes: 10 additions & 10 deletions packages/babel-plugin-transform-runtime/src/index.js
View file
Open in desktop
Expand Up @@ -234,7 +234,7 @@ export default declare((api, options, dirname) => {
: "helpers";

return this.addDefaultImport(
`${modulePath}/${helpersDir}/${name}`,
`${modulePath}/${helpersDir}/${name}.js`,
name,
blockHoist,
);
Expand Down Expand Up @@ -275,7 +275,7 @@ export default declare((api, options, dirname) => {
if (name === "regeneratorRuntime" && useRuntimeRegenerator) {
path.replaceWith(
this.addDefaultImport(
`${modulePath}/regenerator`,
`${modulePath}/regenerator/index.js`,
"regeneratorRuntime",
),
);
Expand All @@ -291,7 +291,7 @@ export default declare((api, options, dirname) => {
// transform global built-ins like `Symbol()`, `new Promise`
path.replaceWith(
this.addDefaultImport(
`${modulePath}/${corejsRoot}/${BuiltIns[name].path}`,
`${modulePath}/${corejsRoot}/${BuiltIns[name].path}.js`,
name,
),
);
Expand Down Expand Up @@ -332,7 +332,7 @@ export default declare((api, options, dirname) => {
node.callee = t.memberExpression(
t.callExpression(
this.addDefaultImport(
`${moduleName}/${corejsRoot}/instance/${InstanceProperties[propertyName].path}`,
`${moduleName}/${corejsRoot}/instance/${InstanceProperties[propertyName].path}.js`,
`${propertyName}InstanceProperty`,
),
[context2],
Expand All @@ -354,7 +354,7 @@ export default declare((api, options, dirname) => {
path.replaceWith(
t.callExpression(
this.addDefaultImport(
`${modulePath}/core-js/get-iterator`,
`${modulePath}/core-js/get-iterator.js`,
"getIterator",
),
[object],
Expand All @@ -371,7 +371,7 @@ export default declare((api, options, dirname) => {
path.replaceWith(
t.callExpression(
this.addDefaultImport(
`${modulePath}/core-js/is-iterable`,
`${modulePath}/core-js/is-iterable.js`,
"isIterable",
),
[path.node.right],
Expand Down Expand Up @@ -399,7 +399,7 @@ export default declare((api, options, dirname) => {
path.replaceWith(
t.callExpression(
this.addDefaultImport(
`${moduleName}/core-js/get-iterator-method`,
`${moduleName}/core-js/get-iterator-method.js`,
"getIteratorMethod",
),
[object],
Expand Down Expand Up @@ -427,7 +427,7 @@ export default declare((api, options, dirname) => {
path.replaceWith(
t.callExpression(
this.addDefaultImport(
`${moduleName}/${corejsRoot}/instance/${InstanceProperties[propertyName].path}`,
`${moduleName}/${corejsRoot}/instance/${InstanceProperties[propertyName].path}.js`,
`${propertyName}InstanceProperty`,
),
[object],
Expand All @@ -439,7 +439,7 @@ export default declare((api, options, dirname) => {

path.replaceWith(
this.addDefaultImport(
`${modulePath}/${corejsRoot}/${StaticProperties[objectName][propertyName].path}`,
`${modulePath}/${corejsRoot}/${StaticProperties[objectName][propertyName].path}.js`,
`${objectName}$${propertyName}`,
),
);
Expand All @@ -460,7 +460,7 @@ export default declare((api, options, dirname) => {
path.replaceWith(
t.memberExpression(
this.addDefaultImport(
`${modulePath}/${corejsRoot}/${BuiltIns[name].path}`,
`${modulePath}/${corejsRoot}/${BuiltIns[name].path}.js`,
name,
),
node.property,
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/node_modules/@babel/runtime/helpers/classCallCheck");
var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/node_modules/@babel/runtime/helpers/classCallCheck.js");

let Foo = function Foo() {
"use strict";
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/node_modules/@babel/runtime/helpers/classCallCheck");
var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/node_modules/@babel/runtime/helpers/classCallCheck.js");

let Foo = function Foo() {
"use strict";
Expand Down
6 changes: 3 additions & 3 deletions ...bel-plugin-transform-runtime/test/fixtures/runtime-corejs2/aliased-constructors/output.js
View file
Open in desktop
@@ -1,8 +1,8 @@
var _Map = require("@babel/runtime-corejs2/core-js/map");
var _Map = require("@babel/runtime-corejs2/core-js/map.js");

var _Symbol = require("@babel/runtime-corejs2/core-js/symbol");
var _Symbol = require("@babel/runtime-corejs2/core-js/symbol.js");

var _Promise = require("@babel/runtime-corejs2/core-js/promise");
var _Promise = require("@babel/runtime-corejs2/core-js/promise.js");

obj.constructor === Object;
obj.constructor === _Promise;
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/catch-all/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
var _Promise = require("@babel/runtime-corejs2/core-js/promise");
var _Promise = require("@babel/runtime-corejs2/core-js/promise.js");

_Promise.resolve;
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck");
var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck.js");

let Foo = function Foo() {
"use strict";
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/es6-for-of/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _getIterator = require("@babel/runtime-corejs2/core-js/get-iterator");
var _getIterator = require("@babel/runtime-corejs2/core-js/get-iterator.js");

var _iteratorNormalCompletion = true;
var _didIteratorError = false;
Expand Down
4 changes: 2 additions & 2 deletions ...plugin-transform-runtime/test/fixtures/runtime-corejs2/evaluated-static-methods/output.js
View file
Open in desktop
@@ -1,6 +1,6 @@
var _Array$isArray = require("@babel/runtime-corejs2/core-js/array/is-array");
var _Array$isArray = require("@babel/runtime-corejs2/core-js/array/is-array.js");

var _Array$from = require("@babel/runtime-corejs2/core-js/array/from");
var _Array$from = require("@babel/runtime-corejs2/core-js/array/from.js");

var _isArray = "isArray";
_Array$from; // polyfill
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/full/output.mjs
View file
Open in desktop
@@ -1,5 +1,5 @@
import _regeneratorRuntime from "@babel/runtime-corejs2/regenerator";
import _Symbol from "@babel/runtime-corejs2/core-js/symbol";
import _regeneratorRuntime from "@babel/runtime-corejs2/regenerator/index.js";
import _Symbol from "@babel/runtime-corejs2/core-js/symbol.js";

var _marked =
/*#__PURE__*/
Expand Down
34 changes: 17 additions & 17 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/math/output.js
View file
Open in desktop
@@ -1,36 +1,36 @@
var _Math$trunc = require("@babel/runtime-corejs2/core-js/math/trunc");
var _Math$trunc = require("@babel/runtime-corejs2/core-js/math/trunc.js");

var _Math$tanh = require("@babel/runtime-corejs2/core-js/math/tanh");
var _Math$tanh = require("@babel/runtime-corejs2/core-js/math/tanh.js");

var _Math$sinh = require("@babel/runtime-corejs2/core-js/math/sinh");
var _Math$sinh = require("@babel/runtime-corejs2/core-js/math/sinh.js");

var _Math$sign = require("@babel/runtime-corejs2/core-js/math/sign");
var _Math$sign = require("@babel/runtime-corejs2/core-js/math/sign.js");

var _Math$log2 = require("@babel/runtime-corejs2/core-js/math/log2");
var _Math$log2 = require("@babel/runtime-corejs2/core-js/math/log2.js");

var _Math$log1p = require("@babel/runtime-corejs2/core-js/math/log1p");
var _Math$log1p = require("@babel/runtime-corejs2/core-js/math/log1p.js");

var _Math$log = require("@babel/runtime-corejs2/core-js/math/log10");
var _Math$log = require("@babel/runtime-corejs2/core-js/math/log10.js");

var _Math$imul = require("@babel/runtime-corejs2/core-js/math/imul");
var _Math$imul = require("@babel/runtime-corejs2/core-js/math/imul.js");

var _Math$hypot = require("@babel/runtime-corejs2/core-js/math/hypot");
var _Math$hypot = require("@babel/runtime-corejs2/core-js/math/hypot.js");

var _Math$fround = require("@babel/runtime-corejs2/core-js/math/fround");
var _Math$fround = require("@babel/runtime-corejs2/core-js/math/fround.js");

var _Math$expm = require("@babel/runtime-corejs2/core-js/math/expm1");
var _Math$expm = require("@babel/runtime-corejs2/core-js/math/expm1.js");

var _Math$cosh = require("@babel/runtime-corejs2/core-js/math/cosh");
var _Math$cosh = require("@babel/runtime-corejs2/core-js/math/cosh.js");

var _Math$clz = require("@babel/runtime-corejs2/core-js/math/clz32");
var _Math$clz = require("@babel/runtime-corejs2/core-js/math/clz32.js");

var _Math$cbrt = require("@babel/runtime-corejs2/core-js/math/cbrt");
var _Math$cbrt = require("@babel/runtime-corejs2/core-js/math/cbrt.js");

var _Math$atanh = require("@babel/runtime-corejs2/core-js/math/atanh");
var _Math$atanh = require("@babel/runtime-corejs2/core-js/math/atanh.js");

var _Math$asinh = require("@babel/runtime-corejs2/core-js/math/asinh");
var _Math$asinh = require("@babel/runtime-corejs2/core-js/math/asinh.js");

var _Math$acosh = require("@babel/runtime-corejs2/core-js/math/acosh");
var _Math$acosh = require("@babel/runtime-corejs2/core-js/math/acosh.js");

_Math$acosh;
_Math$asinh;
Expand Down
6 changes: 3 additions & 3 deletions ...es/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/output.js
View file
Open in desktop
@@ -1,10 +1,10 @@
"use strict";

var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault.js");

var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck.js"));

var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass.js"));

var _foo = _interopRequireDefault(require("foo"));

Expand Down
6 changes: 3 additions & 3 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js
View file
Open in desktop
@@ -1,10 +1,10 @@
"use strict";

var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault.js");

var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys");
var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys.js");

var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property.js");

_Object$defineProperty(exports, "__esModule", {
value: true
Expand Down
2 changes: 1 addition & 1 deletion ...abel-plugin-transform-runtime/test/fixtures/runtime-corejs2/regenerator-runtime/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _regeneratorRuntime = require("@babel/runtime-corejs2/regenerator");
var _regeneratorRuntime = require("@babel/runtime-corejs2/regenerator/index.js");

void
/*#__PURE__*/
Expand Down
2 changes: 1 addition & 1 deletion ...babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/symbol-iterator-in/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
var _isIterable = require("@babel/runtime-corejs2/core-js/is-iterable");
var _isIterable = require("@babel/runtime-corejs2/core-js/is-iterable.js");

_isIterable(Object(arr));
2 changes: 1 addition & 1 deletion ...es/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/symbol-iterator/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
var _Symbol$iterator = require("@babel/runtime-corejs2/core-js/symbol/iterator");
var _Symbol$iterator = require("@babel/runtime-corejs2/core-js/symbol/iterator.js");

_Symbol$iterator;
6 changes: 3 additions & 3 deletions ...bel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/output.js
View file
Open in desktop
@@ -1,8 +1,8 @@
var _Map = require("@babel/runtime-corejs3/core-js-stable/map");
var _Map = require("@babel/runtime-corejs3/core-js-stable/map.js");

var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol.js");

var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise.js");

obj.constructor === Object;
obj.constructor === _Promise;
Expand Down
40 changes: 20 additions & 20 deletions ...ugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/output.js
View file
Open in desktop
@@ -1,42 +1,42 @@
var _setTimeout = require("@babel/runtime-corejs3/core-js/set-timeout");
var _setTimeout = require("@babel/runtime-corejs3/core-js/set-timeout.js");

var _setInterval = require("@babel/runtime-corejs3/core-js/set-interval");
var _setInterval = require("@babel/runtime-corejs3/core-js/set-interval.js");

var _setImmediate = require("@babel/runtime-corejs3/core-js/set-immediate");
var _setImmediate = require("@babel/runtime-corejs3/core-js/set-immediate.js");

var _queueMicrotask = require("@babel/runtime-corejs3/core-js/queue-microtask");
var _queueMicrotask = require("@babel/runtime-corejs3/core-js/queue-microtask.js");

var _parseInt = require("@babel/runtime-corejs3/core-js/parse-int");
var _parseInt = require("@babel/runtime-corejs3/core-js/parse-int.js");

var _parseFloat = require("@babel/runtime-corejs3/core-js/parse-float");
var _parseFloat = require("@babel/runtime-corejs3/core-js/parse-float.js");

var _globalThis = require("@babel/runtime-corejs3/core-js/global-this");
var _globalThis = require("@babel/runtime-corejs3/core-js/global-this.js");

var _compositeSymbol = require("@babel/runtime-corejs3/core-js/composite-symbol");
var _compositeSymbol = require("@babel/runtime-corejs3/core-js/composite-symbol.js");

var _compositeKey = require("@babel/runtime-corejs3/core-js/composite-key");
var _compositeKey = require("@babel/runtime-corejs3/core-js/composite-key.js");

var _clearImmediate = require("@babel/runtime-corejs3/core-js/clear-immediate");
var _clearImmediate = require("@babel/runtime-corejs3/core-js/clear-immediate.js");

var _WeakSet = require("@babel/runtime-corejs3/core-js/weak-set");
var _WeakSet = require("@babel/runtime-corejs3/core-js/weak-set.js");

var _WeakMap = require("@babel/runtime-corejs3/core-js/weak-map");
var _WeakMap = require("@babel/runtime-corejs3/core-js/weak-map.js");

var _URLSearchParams = require("@babel/runtime-corejs3/core-js/url-search-params");
var _URLSearchParams = require("@babel/runtime-corejs3/core-js/url-search-params.js");

var _URL = require("@babel/runtime-corejs3/core-js/url");
var _URL = require("@babel/runtime-corejs3/core-js/url.js");

var _Symbol = require("@babel/runtime-corejs3/core-js/symbol");
var _Symbol = require("@babel/runtime-corejs3/core-js/symbol.js");

var _Set = require("@babel/runtime-corejs3/core-js/set");
var _Set = require("@babel/runtime-corejs3/core-js/set.js");

var _Promise = require("@babel/runtime-corejs3/core-js/promise");
var _Promise = require("@babel/runtime-corejs3/core-js/promise.js");

var _Observable = require("@babel/runtime-corejs3/core-js/observable");
var _Observable = require("@babel/runtime-corejs3/core-js/observable.js");

var _Map = require("@babel/runtime-corejs3/core-js/map");
var _Map = require("@babel/runtime-corejs3/core-js/map.js");

var _AggregateError = require("@babel/runtime-corejs3/core-js/aggregate-error");
var _AggregateError = require("@babel/runtime-corejs3/core-js/aggregate-error.js");

_AggregateError;
_Map;
Expand Down