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.

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

fix: resolve mismatch with types declaration and docs for resourceQuery #13296

Merged
merged 6 commits into from May 19, 2021

Conversation

bolariin
Copy link
Contributor

@bolariin bolariin commented May 3, 2021

Resolves #13284

I followed the suggestion provided and made changes accordingly

What kind of change does this PR introduce?

This is a bugfix

Did you add tests for your changes?

I updated the snapshot tests

Does this PR introduce a breaking change?

No, it does not

What needs to be documented once your changes are merged?

I don't think any changes need to be made to the documentation

@webpack-bot
Copy link
Contributor

For maintainers only:

  • This needs to be documented (issue in webpack/webpack.js.org will be filed when merged)
  • This needs to be backported to webpack 4 (issue will be created when merged)

Copy link
Member

@sokra sokra left a comment

Choose a reason for hiding this comment

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

add a test case -> test\configCases\rule-set

declarations/WebpackOptions.d.ts Outdated Show resolved Hide resolved
Comment on lines 3380 to 3402
"description": "Logical AND.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
},
"not": {
"description": "Logical NOT.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
},
"or": {
"description": "Logical OR.",
"oneOf": [
{
"$ref": "#/definitions/RuleSetConditions"
"$ref": "#/definitions/RuleSetCondition"
}
]
}
Copy link
Member

Choose a reason for hiding this comment

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

Could you put the whole object with and, or, not into a separate definition RuleSetLogicalConditions.

This helps in generating more readable typings.

@webpack-bot
Copy link
Contributor

@bolariin Thanks for your update.

I labeled the Pull Request so reviewers will review it again.

@sokra Please review the new changes.

@webpack-bot
Copy link
Contributor

Thank you for your pull request! The most important CI builds succeeded, we’ll review the pull request soon.

@sokra sokra merged commit ca2b56f into webpack:master May 19, 2021
@sokra
Copy link
Member

sokra commented May 19, 2021

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Types/Doc mismatch for resourceQuery: { not: /regex/ }
3 participants