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

Try to resolve browserslist config when targets are not specified #10897

Closed
wants to merge 2 commits into from
Closed

Try to resolve browserslist config when targets are not specified #10897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e91277
breaking: return defaults browserslists query when no targets is spec…
JLHwung Jan 17, 2020
8a77cda
test: update test fixtures
JLHwung Jun 23, 2020
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 packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }

Expand Down Expand Up @@ -50,7 +50,7 @@ var Foo = /*#__PURE__*/function () {
return Foo;
}();

exports["default"] = Foo;
exports.default = Foo;

function foo() {
return _foo.apply(this, arguments);
Expand Down
48 changes: 16 additions & 32 deletions packages/babel-helper-compilation-targets/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,6 @@ export { getInclusionReasons } from "./debug";
export { default as filterItems, isRequired } from "./filter-items";
export { unreleasedLabels } from "./targets";

const browserslistDefaults = browserslist.defaults;

const validBrowserslistTargets = [
...Object.keys(browserslist.data),
...Object.keys(browserslist.aliases),
];

function objectToBrowserslist(object: Targets): Array<string> {
return Object.keys(object).reduce((list, targetName) => {
if (validBrowserslistTargets.indexOf(targetName) >= 0) {
const targetVersion = object[targetName];
return list.concat(`${targetName} ${targetVersion}`);
}
return list;
}, []);
}

function validateTargetNames(targets: InputTargets): Targets {
const validTargets = Object.keys(TargetNames);
for (const target in targets) {
Expand Down Expand Up @@ -178,7 +161,7 @@ export default function getTargets(
}

// Parse browsers target via browserslist
const browsersquery = validateBrowsers(browsers);
let browsersquery = validateBrowsers(browsers);

// Remove esmodules after being consumed to fix `hasTargets` below
const input = { ...inputTargets };
Expand All @@ -192,29 +175,30 @@ export default function getTargets(
const shouldSearchForConfig =
!options.ignoreBrowserslistConfig && !hasTargets;

if (shouldParseBrowsers || shouldSearchForConfig) {
// If no targets are passed, we need to overwrite browserslist's defaults
// so that we enable all transforms (acting like the now deprecated
// preset-latest).
//
// Note, if browserslist resolves the config (ex. package.json), then usage
// of `defaults` in queries will be different since we don't want to break
// the behavior of "no targets is the same as preset-latest".
if (!hasTargets) {
browserslist.defaults = objectToBrowserslist(targets);
if (!hasTargets) {
// If no targets are passed, we call loadConfig to resolve any external browserslist
// config
if (shouldSearchForConfig) {
browsersquery = browserslist.loadConfig({
path: options.configPath,
env: options.browserslistEnv,
});
}
// If there is no external browserslist config and no targets are specified,
// return "defaults" browserslists query
if (!browsersquery) {
browsersquery = "defaults";
}
}

if (shouldParseBrowsers || shouldSearchForConfig) {
const browsers = browserslist(browsersquery, {
path: options.configPath,
mobileToDesktop: true,
env: options.browserslistEnv,
});

const queryBrowsers = getLowestVersions(browsers);
targets = Object.assign(queryBrowsers, targets);

// Reset browserslist defaults
browserslist.defaults = browserslistDefaults;
}

// Parse remaining targets
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _net = babelHelpers.interopRequireDefault(require("net"));

Expand Down Expand Up @@ -35,7 +35,7 @@ var Connection = /*#__PURE__*/function (_EventEmitter) {
babelHelpers.createClass(Connection, [{
key: "send",
value: function send(message) {
this.sock.write(_binarySerializer["default"].serializeMessage(message));
this.sock.write(_binarySerializer.default.serializeMessage(message));
}
}, {
key: "disconnect",
Expand All @@ -46,4 +46,4 @@ var Connection = /*#__PURE__*/function (_EventEmitter) {
return Connection;
}(_events.EventEmitter);

exports["default"] = Connection;
exports.default = Connection;
6 changes: 3 additions & 3 deletions packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _BaseFoo2 = babelHelpers.interopRequireDefault(require("./BaseFoo"));

Expand All @@ -29,6 +29,6 @@ var SubFoo = /*#__PURE__*/function (_BaseFoo) {
}
}]);
return SubFoo;
}(_BaseFoo2["default"]);
}(_BaseFoo2.default);

exports["default"] = SubFoo;
exports.default = SubFoo;
8 changes: 4 additions & 4 deletions packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _react = babelHelpers.interopRequireDefault(require("react"));

Expand All @@ -24,12 +24,12 @@ var RandomComponent = /*#__PURE__*/function (_Component) {
babelHelpers.createClass(RandomComponent, [{
key: "render",
value: function render() {
return /*#__PURE__*/_react["default"].createElement("div", {
return /*#__PURE__*/_react.default.createElement("div", {
className: "sui-RandomComponent"
}, /*#__PURE__*/_react["default"].createElement("h2", null, "Hi there!"));
}, /*#__PURE__*/_react.default.createElement("h2", null, "Hi there!"));
}
}]);
return RandomComponent;
}(_react.Component);

exports["default"] = RandomComponent;
exports.default = RandomComponent;
4 changes: 2 additions & 2 deletions packages/babel-plugin-transform-classes/test/fixtures/regression/2941/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _default = function _default() {
babelHelpers.classCallCheck(this, _default);
};

exports["default"] = _default;
exports.default = _default;
4 changes: 2 additions & 2 deletions packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; }

Expand Down Expand Up @@ -55,4 +55,4 @@ var a2 = /*#__PURE__*/function (_b2) {
return a2;
}(b);

exports["default"] = a2;
exports.default = a2;
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-classes/test/fixtures/regression/T6750/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = _default;
exports.default = _default;

function _default() {
return /*#__PURE__*/function () {
Expand Down
4 changes: 2 additions & 2 deletions ...sform-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _default = function _default() {
return {
Expand All @@ -13,4 +13,4 @@ var _default = function _default() {
};
};

exports["default"] = _default;
exports.default = _default;
4 changes: 2 additions & 2 deletions ...sform-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _default = function _default(_ref) {
var _onClick = _ref.onClick;
Expand All @@ -14,4 +14,4 @@ var _default = function _default(_ref) {
});
};

exports["default"] = _default;
exports.default = _default;
8 changes: 4 additions & 4 deletions packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
exports.default = void 0;

var _args = _interopRequireDefault(require("utils/url/args"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand Down Expand Up @@ -57,11 +57,11 @@ var App = /*#__PURE__*/function (_Component) {
_createClass(App, [{
key: "componentDidMount",
value: function componentDidMount() {
this.exportType = _args["default"].get('type', window.location.href);
this.exportType = _args.default.get('type', window.location.href);
}
}]);

return App;
}(Component);

exports["default"] = App;
exports.default = App;
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-regenerator/test/fixtures/regression/6733/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = _callee;
exports.default = _callee;

var _marked = /*#__PURE__*/regeneratorRuntime.mark(_callee);

Expand Down
1 change: 0 additions & 1 deletion packages/babel-preset-env/src/normalize-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ export const checkDuplicateIncludeExcludes = (
};

const normalizeTargets = targets => {
// TODO: Allow to use only query or strings as a targets from next breaking change.
if (typeof targets === "string" || Array.isArray(targets)) {
return { browsers: targets };
}
Expand Down
19 changes: 0 additions & 19 deletions packages/babel-preset-env/test/fixtures/corejs3/entry-all/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,21 @@ import "core-js/modules/es.array.for-each";
import "core-js/modules/es.array.from";
import "core-js/modules/es.array.includes";
import "core-js/modules/es.array.index-of";
import "core-js/modules/es.array.is-array";
import "core-js/modules/es.array.iterator";
import "core-js/modules/es.array.join";
import "core-js/modules/es.array.last-index-of";
import "core-js/modules/es.array.map";
import "core-js/modules/es.array.of";
import "core-js/modules/es.array.reduce";
import "core-js/modules/es.array.reduce-right";
import "core-js/modules/es.array.reverse";
import "core-js/modules/es.array.slice";
import "core-js/modules/es.array.some";
import "core-js/modules/es.array.sort";
import "core-js/modules/es.array.species";
import "core-js/modules/es.array.splice";
import "core-js/modules/es.array.unscopables.flat";
import "core-js/modules/es.array.unscopables.flat-map";
import "core-js/modules/es.array-buffer.constructor";
import "core-js/modules/es.array-buffer.is-view";
import "core-js/modules/es.array-buffer.slice";
import "core-js/modules/es.data-view";
import "core-js/modules/es.date.now";
import "core-js/modules/es.date.to-iso-string";
import "core-js/modules/es.date.to-json";
import "core-js/modules/es.date.to-primitive";
import "core-js/modules/es.date.to-string";
import "core-js/modules/es.function.bind";
import "core-js/modules/es.function.has-instance";
import "core-js/modules/es.function.name";
import "core-js/modules/es.json.to-string-tag";
Expand Down Expand Up @@ -84,12 +73,8 @@ import "core-js/modules/es.number.min-safe-integer";
import "core-js/modules/es.number.parse-float";
import "core-js/modules/es.number.parse-int";
import "core-js/modules/es.number.to-fixed";
import "core-js/modules/es.number.to-precision";
import "core-js/modules/es.object.assign";
import "core-js/modules/es.object.create";
import "core-js/modules/es.object.define-getter";
import "core-js/modules/es.object.define-properties";
import "core-js/modules/es.object.define-property";
import "core-js/modules/es.object.define-setter";
import "core-js/modules/es.object.entries";
import "core-js/modules/es.object.freeze";
Expand All @@ -107,11 +92,8 @@ import "core-js/modules/es.object.lookup-getter";
import "core-js/modules/es.object.lookup-setter";
import "core-js/modules/es.object.prevent-extensions";
import "core-js/modules/es.object.seal";
import "core-js/modules/es.object.set-prototype-of";
import "core-js/modules/es.object.to-string";
import "core-js/modules/es.object.values";
import "core-js/modules/es.parse-float";
import "core-js/modules/es.parse-int";
import "core-js/modules/es.promise";
import "core-js/modules/es.promise.finally";
import "core-js/modules/es.reflect.apply";
Expand Down Expand Up @@ -284,7 +266,6 @@ import "core-js/modules/web.dom-collections.for-each";
import "core-js/modules/web.dom-collections.iterator";
import "core-js/modules/web.immediate";
import "core-js/modules/web.queue-microtask";
import "core-js/modules/web.timers";
import "core-js/modules/web.url";
import "core-js/modules/web.url.to-json";
import "core-js/modules/web.url-search-params";
Expand Down
18 changes: 0 additions & 18 deletions packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,21 @@ import "core-js/modules/es.array.for-each";
import "core-js/modules/es.array.from";
import "core-js/modules/es.array.includes";
import "core-js/modules/es.array.index-of";
import "core-js/modules/es.array.is-array";
import "core-js/modules/es.array.iterator";
import "core-js/modules/es.array.join";
import "core-js/modules/es.array.last-index-of";
import "core-js/modules/es.array.map";
import "core-js/modules/es.array.of";
import "core-js/modules/es.array.reduce";
import "core-js/modules/es.array.reduce-right";
import "core-js/modules/es.array.reverse";
import "core-js/modules/es.array.slice";
import "core-js/modules/es.array.some";
import "core-js/modules/es.array.sort";
import "core-js/modules/es.array.species";
import "core-js/modules/es.array.splice";
import "core-js/modules/es.array.unscopables.flat";
import "core-js/modules/es.array.unscopables.flat-map";
import "core-js/modules/es.array-buffer.constructor";
import "core-js/modules/es.array-buffer.is-view";
import "core-js/modules/es.array-buffer.slice";
import "core-js/modules/es.data-view";
import "core-js/modules/es.date.now";
import "core-js/modules/es.date.to-iso-string";
import "core-js/modules/es.date.to-json";
import "core-js/modules/es.date.to-primitive";
import "core-js/modules/es.date.to-string";
import "core-js/modules/es.function.bind";
import "core-js/modules/es.function.has-instance";
import "core-js/modules/es.function.name";
import "core-js/modules/es.json.to-string-tag";
Expand Down Expand Up @@ -84,12 +73,8 @@ import "core-js/modules/es.number.min-safe-integer";
import "core-js/modules/es.number.parse-float";
import "core-js/modules/es.number.parse-int";
import "core-js/modules/es.number.to-fixed";
import "core-js/modules/es.number.to-precision";
import "core-js/modules/es.object.assign";
import "core-js/modules/es.object.create";
import "core-js/modules/es.object.define-getter";
import "core-js/modules/es.object.define-properties";
import "core-js/modules/es.object.define-property";
import "core-js/modules/es.object.define-setter";
import "core-js/modules/es.object.entries";
import "core-js/modules/es.object.freeze";
Expand All @@ -107,11 +92,8 @@ import "core-js/modules/es.object.lookup-getter";
import "core-js/modules/es.object.lookup-setter";
import "core-js/modules/es.object.prevent-extensions";
import "core-js/modules/es.object.seal";
import "core-js/modules/es.object.set-prototype-of";
import "core-js/modules/es.object.to-string";
import "core-js/modules/es.object.values";
import "core-js/modules/es.parse-float";
import "core-js/modules/es.parse-int";
import "core-js/modules/es.promise";
import "core-js/modules/es.promise.finally";
import "core-js/modules/es.reflect.apply";
Expand Down