Skip to content
This repository has been archived by the owner on May 11, 2018. It is now read-only.

Adds browsers property to use browserslist's queries #19

Merged
merged 12 commits into from
Oct 13, 2016
Merged

Adds browsers property to use browserslist's queries #19

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
73d242a
Use browserslist to parse browsers from query.
yavorsky Oct 7, 2016
5c659f9
Update README.
yavorsky Oct 7, 2016
4f80969
Use int values.
yavorsky Oct 7, 2016
dd908e0
Allow `isPluginRequired` use browserslist queries.
yavorsky Oct 7, 2016
b21e564
Fix conflicts during different versions merging.
yavorsky Oct 7, 2016
1152f62
Add tests for browserslist queries.
yavorsky Oct 8, 2016
4a6fbef
Early return for getTargets.
yavorsky Oct 8, 2016
0bff667
Update README: Describe `browsers` option.
yavorsky Oct 8, 2016
c22ba0e
fix doc [skip ci]
hzoo Oct 12, 2016
fc09346
Move to dependencies [skip ci]
hzoo Oct 12, 2016
56f2209
Remove unused const.
yavorsky Oct 13, 2016
99a63ef
Use doublequotes for strings.
yavorsky Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,24 @@ exports.A = A;
export class A {}
```

```js
// using browserslist
{
"presets": [
["env", {
"targets": {
"chrome": 52,
"browsers": ["last 2 versions", "safari 7"]
}
}]
]
}

// ...

export class A {}
```

### Example with `debug: true`

```js
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"babel-plugin-transform-flow-strip-types": "^6.8.0",
"babel-preset-es2015": "^6.14.0",
"babel-register": "^6.14.0",
"browserslist": "^1.4.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will have to be a dependency if we are using it in src

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although it would be better if it was used as a devDependency

"compat-table": "github:hzoo/compat-table#node-fix",
"eslint": "^3.3.1",
"eslint-config-babel": "^1.0.1",
Expand Down
12 changes: 11 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// "es5-property-mutators",

import pluginList from "../data/plugins.json";
import browserslist from "browserslist";

export const plugins = [
"es3-member-expression-literals",
Expand Down Expand Up @@ -62,7 +63,16 @@ export const isPluginRequired = (supportedEnvironments, plugin) => {
};

const getTargets = targetOpts => {
return targetOpts || {};
const mergedOpts = targetOpts || {};
const browserOpts = targetOpts['browsers'];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to do any validation here? (like in loose/modules we verify if boolean etc)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see it's ignored right below

if (typeof browserOpts === 'string' || Array.isArray(browserOpts)) {
delete mergedOpts.browsers;
browserslist(browserOpts).forEach(browser => {
const [browserName, browserVer] = browser.split(' ');
if (!mergedOpts[browserName]) mergedOpts[browserName] = parseInt(browserVer);
});
}
return mergedOpts;
Copy link
Member

@hzoo hzoo Oct 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also do an early return here

const browserOpts = targetOpts.browsers;
if (isBrowsersQueryValid(browserOpts)) {
  const queryBrowsers = getLowestVersions(browserslist(browserOpts));
  return mergeBrowsers(queryBrowsers, targetOpts);
}
return targetOps;

};

// TODO: Allow specifying plugins as either shortened or full name
Expand Down