feat: allow all browserslist options via JS API #1489
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dangreen
requested changes
Jun 16, 2023
src/useragentRegex/useragentRegex.ts
Outdated
Comment on lines
26
to
44
| const { | ||
| browsers, | ||
| env, | ||
| path, | ||
| ...otherOptions | ||
| } = options | ||
| const finalOptions = { | ||
| ...defaultOptions, | ||
| ...otherOptions | ||
| const regexpOptions: SemverCompareOptions = { | ||
| ...defaultOptions | ||
| } | ||
| const browserslistOptions: BrowserslistRequest = {} | ||
|
|
||
| for (const optName of Object.keys(options) as (keyof UserAgentRegexOptions)[]) { | ||
| if (optName in defaultOptions) { | ||
| regexpOptions[optName] = options[optName] | ||
| } else { | ||
| browserslistOptions[optName] = options[optName] | ||
| } | ||
| } | ||
| const browsersList = getBrowsersList({ | ||
| browsers, | ||
| env, | ||
| path | ||
| }) | ||
|
|
||
| const browsersList = getBrowsersList(browserslistOptions) | ||
| const mergedBrowsers = mergeBrowserVersions(browsersList) | ||
| const sourceRegexes = getRegexesForBrowsers(mergedBrowsers, finalOptions) | ||
| const versionedRegexes = applyVersionsToRegexes(sourceRegexes, finalOptions) | ||
| const sourceRegexes = getRegexesForBrowsers(mergedBrowsers, regexpOptions) | ||
| const versionedRegexes = applyVersionsToRegexes(sourceRegexes, regexpOptions) |
There was a problem hiding this comment.
Let's make code more easer
export function getPreUserAgentRegexes(options: UserAgentRegexOptions = {}) {
const finalOptions = {
...defaultOptions,
...options
}
const browsersList = getBrowsersList(finalOptions)
const mergedBrowsers = mergeBrowserVersions(browsersList)
const sourceRegexes = getRegexesForBrowsers(mergedBrowsers, finalOptions)
const versionedRegexes = applyVersionsToRegexes(sourceRegexes, finalOptions)
return versionedRegexes
}There was a problem hiding this comment.
Yeah, I considered that as well. I didn't want to make the assumption that browserslist wouldn't throw on unknown options. If you're okay with that, I'll make the change.
dangreen
approved these changes
Jun 16, 2023
eliasaadeh
reviewed
Jun 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1484 by allowing the JS API to pass any non-regex option to
browserslist. I implemented this in a way that is both backwards compatible and doesn't require knowledge of thebrowserslistoptions.This doesn't implement for the CLI as the current
envandpathoptions aren't possible there either and doing so requires listing out all thebrowserslistoptions.